Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7867208

Browse files
tirantiran
committed
Merged revisions 59371-59375 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r59374 | georg.brandl | 2007-12-05 22:52:40 +0100 (Wed, 05 Dec 2007) | 2 lines Add Ross Light, a GHOP student, to ACKs. ........ r59375 | christian.heimes | 2007-12-05 22:57:25 +0100 (Wed, 05 Dec 2007) | 2 lines The macros _WIN32, _WIN64 and _M_X64 are defined by the compiler. The VS 2008 IDE doesn't know about (some) of the macros and can display wrong information. In my case a section #ifdef _WIN64 was grayed out although the platform was x64. I've added the macros to pyproject.vsprops and x64.vsprops. I've also added a paragraph about the property files to the readme and fixed the order of pyupdate > pyinstrument. ........
1 parent b9eccbf commit 7867208

11 files changed

Lines changed: 49 additions & 22 deletions

‎Doc/ACKS.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ [email protected]), and we'll be glad to correct the problem.
109109
* Glyph Lefkowitz
110110
* Robert Lehmann
111111
* Marc-André Lemburg
112+
* Ross Light
112113
* Ulf A. Lindgren
113114
* Everett Lipman
114115
* Mirko Liss

‎PCbuild9/bz2.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
<Configuration
403403
Name="PGUpdate|Win32"
404404
ConfigurationType="2"
405-
InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops;.\pginstrument.vsprops"
405+
InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
406406
CharacterSet="0"
407407
WholeProgramOptimization="1"
408408
>
@@ -465,7 +465,7 @@
465465
<Configuration
466466
Name="PGUpdate|x64"
467467
ConfigurationType="2"
468-
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\pginstrument.vsprops"
468+
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
469469
CharacterSet="0"
470470
WholeProgramOptimization="1"
471471
>

‎PCbuild9/pgupdate.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<VisualStudioPropertySheet
33
ProjectType="Visual C++"
44
Version="8.00"
5-
Name="pgoptimize"
5+
Name="pgupdate"
66
OutputDirectory="$(SolutionDir)$(PlatformName)-pgo\"
77
InheritedPropertySheets="$(SolutionDir)\pginstrument.vsprops"
88
>

‎PCbuild9/pyexpat.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
<Configuration
391391
Name="PGUpdate|Win32"
392392
ConfigurationType="2"
393-
InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops;.\pginstrument.vsprops"
393+
InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
394394
CharacterSet="0"
395395
WholeProgramOptimization="1"
396396
>
@@ -451,7 +451,7 @@
451451
<Configuration
452452
Name="PGUpdate|x64"
453453
ConfigurationType="2"
454-
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\pginstrument.vsprops"
454+
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
455455
CharacterSet="0"
456456
WholeProgramOptimization="1"
457457
>

‎PCbuild9/pyproject.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
InlineFunctionExpansion="1"
1313
EnableIntrinsicFunctions="true"
1414
AdditionalIncludeDirectories="..\Include; ..\PC"
15-
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
15+
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32"
1616
StringPooling="true"
1717
ExceptionHandling="0"
1818
RuntimeLibrary="0"

‎PCbuild9/python.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@
318318
<Configuration
319319
Name="PGInstrument|Win32"
320320
ConfigurationType="1"
321-
InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
321+
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"
322322
UseOfMFC="0"
323323
ATLMinimizesCRunTimeLibraryUsage="false"
324324
CharacterSet="2"
@@ -392,7 +392,7 @@
392392
<Configuration
393393
Name="PGInstrument|x64"
394394
ConfigurationType="1"
395-
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
395+
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"
396396
UseOfMFC="0"
397397
ATLMinimizesCRunTimeLibraryUsage="false"
398398
CharacterSet="2"
@@ -468,7 +468,7 @@
468468
<Configuration
469469
Name="PGUpdate|Win32"
470470
ConfigurationType="1"
471-
InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
471+
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"
472472
UseOfMFC="0"
473473
ATLMinimizesCRunTimeLibraryUsage="false"
474474
CharacterSet="2"
@@ -542,7 +542,7 @@
542542
<Configuration
543543
Name="PGUpdate|x64"
544544
ConfigurationType="1"
545-
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
545+
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"
546546
UseOfMFC="0"
547547
ATLMinimizesCRunTimeLibraryUsage="false"
548548
CharacterSet="2"

‎PCbuild9/pythoncore.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
<Configuration
327327
Name="PGInstrument|Win32"
328328
ConfigurationType="2"
329-
InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
329+
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"
330330
UseOfMFC="0"
331331
ATLMinimizesCRunTimeLibraryUsage="false"
332332
>
@@ -400,7 +400,7 @@
400400
<Configuration
401401
Name="PGInstrument|x64"
402402
ConfigurationType="2"
403-
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
403+
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"
404404
UseOfMFC="0"
405405
ATLMinimizesCRunTimeLibraryUsage="false"
406406
>
@@ -476,7 +476,7 @@
476476
<Configuration
477477
Name="PGUpdate|Win32"
478478
ConfigurationType="2"
479-
InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
479+
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"
480480
UseOfMFC="0"
481481
ATLMinimizesCRunTimeLibraryUsage="false"
482482
>
@@ -550,7 +550,7 @@
550550
<Configuration
551551
Name="PGUpdate|x64"
552552
ConfigurationType="2"
553-
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
553+
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"
554554
UseOfMFC="0"
555555
ATLMinimizesCRunTimeLibraryUsage="false"
556556
>

‎PCbuild9/pythonw.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
<Configuration
306306
Name="PGInstrument|Win32"
307307
ConfigurationType="1"
308-
InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
308+
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"
309309
UseOfMFC="0"
310310
ATLMinimizesCRunTimeLibraryUsage="false"
311311
>
@@ -377,7 +377,7 @@
377377
<Configuration
378378
Name="PGInstrument|x64"
379379
ConfigurationType="1"
380-
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
380+
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"
381381
UseOfMFC="0"
382382
ATLMinimizesCRunTimeLibraryUsage="false"
383383
>
@@ -450,7 +450,7 @@
450450
<Configuration
451451
Name="PGUpdate|Win32"
452452
ConfigurationType="1"
453-
InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
453+
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"
454454
UseOfMFC="0"
455455
ATLMinimizesCRunTimeLibraryUsage="false"
456456
>
@@ -522,7 +522,7 @@
522522
<Configuration
523523
Name="PGUpdate|x64"
524524
ConfigurationType="1"
525-
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
525+
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"
526526
UseOfMFC="0"
527527
ATLMinimizesCRunTimeLibraryUsage="false"
528528
>

‎PCbuild9/readme.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,31 @@ macro "Py_ENABLE_SHARED" to "Py_NO_ENABLE_SHARED". You may also have to
293293
change the "Runtime Library" from "Multi-threaded DLL (/MD)" to
294294
"Multi-threaded (/MT)".
295295

296+
Visual Studio properties
297+
------------------------
298+
299+
The PCbuild9 solution makes heavy use of Visual Studio property files
300+
(*.vsprops). The properties can be viewed and altered in the Property
301+
Manager (View -> Other Windows -> Property Manager).
302+
303+
* debug (debug macros)
304+
* pginstrument (PGO)
305+
* pgupdate (PGO)
306+
+-- pginstrument
307+
* pyd (python extension, release build)
308+
+-- release
309+
+-- pyproject
310+
* pyd_d (python extension, debug build)
311+
+-- debug
312+
+-- pyproject
313+
* pyproject (base settings for all projects)
314+
* release (release macros)
315+
* x64 (AMD64 / x64 platform specific settings)
316+
317+
The pyproject propertyfile defines _WIN32 and x64 defines _WIN64 and _M_X64
318+
although the macros are set by the compiler, too. The GUI doesn't always know
319+
about the macros and confuse the user with false information.
320+
296321
YOUR OWN EXTENSION DLLs
297322
-----------------------
298323
If you want to create your own extension module DLL, there's an example

‎PCbuild9/w9xpopen.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
<Configuration
286286
Name="PGInstrument|Win32"
287287
ConfigurationType="1"
288-
InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
288+
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"
289289
UseOfMFC="0"
290290
ATLMinimizesCRunTimeLibraryUsage="false"
291291
CharacterSet="2"
@@ -353,7 +353,7 @@
353353
<Configuration
354354
Name="PGInstrument|x64"
355355
ConfigurationType="1"
356-
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
356+
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"
357357
UseOfMFC="0"
358358
ATLMinimizesCRunTimeLibraryUsage="false"
359359
CharacterSet="2"
@@ -423,7 +423,7 @@
423423
<Configuration
424424
Name="PGUpdate|Win32"
425425
ConfigurationType="1"
426-
InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
426+
InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"
427427
UseOfMFC="0"
428428
ATLMinimizesCRunTimeLibraryUsage="false"
429429
CharacterSet="2"
@@ -491,7 +491,7 @@
491491
<Configuration
492492
Name="PGUpdate|x64"
493493
ConfigurationType="1"
494-
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
494+
InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"
495495
UseOfMFC="0"
496496
ATLMinimizesCRunTimeLibraryUsage="false"
497497
CharacterSet="2"

0 commit comments

Comments
 (0)