Merged revisions 59371-59375 via svnmerge from

svn+ssh://pythondev@svn.python.org/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.
........

diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
index 07abc6be88c22b039b2e6ce3711c4379d7e9c390..350b1fa95a737e9c4a19f4d4f86e105e60e3407f 100644 (file)
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -109,6 +109,7 @@ docs@python.org), and we'll be glad to correct the problem.
 * Glyph Lefkowitz
 * Robert Lehmann
 * Marc-André Lemburg
+* Ross Light
 * Ulf A. Lindgren
 * Everett Lipman
 * Mirko Liss

diff --git a/PCbuild9/bz2.vcproj b/PCbuild9/bz2.vcproj
index fc7d76f124a6465b25399dcde1ed04e4bb892771..2c16eb0cbb5ac06021bea14c69b1d1b85bad6c4d 100644 (file)
--- a/PCbuild9/bz2.vcproj
+++ b/PCbuild9/bz2.vcproj
@@ -402,7 +402,7 @@
                <Configuration
                        Name="PGUpdate|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops;.\pginstrument.vsprops"
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -465,7 +465,7 @@
                <Configuration
                        Name="PGUpdate|x64"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\pginstrument.vsprops"
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >

diff --git a/PCbuild9/pgupdate.vsprops b/PCbuild9/pgupdate.vsprops
index 30ab891f223dcc8c49115bad90153378227f13fb..7ce4a3a10ba8da5164bb3bdcf57429805c1d43de 100644 (file)
--- a/PCbuild9/pgupdate.vsprops
+++ b/PCbuild9/pgupdate.vsprops
@@ -2,7 +2,7 @@
 <VisualStudioPropertySheet
        ProjectType="Visual C++"
        Version="8.00"
-       Name="pgoptimize"
+       Name="pgupdate"
        OutputDirectory="$(SolutionDir)$(PlatformName)-pgo\"
        InheritedPropertySheets="$(SolutionDir)\pginstrument.vsprops"
        >

diff --git a/PCbuild9/pyexpat.vcproj b/PCbuild9/pyexpat.vcproj
index 43d11462ca2b21bc8a39782832a2176e1acef577..2d2cd9d1eafd953c754377b2c67ae7ec3a85f60f 100644 (file)
--- a/PCbuild9/pyexpat.vcproj
+++ b/PCbuild9/pyexpat.vcproj
@@ -390,7 +390,7 @@
                <Configuration
                        Name="PGUpdate|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops;.\pginstrument.vsprops"
+                       InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >
@@ -451,7 +451,7 @@
                <Configuration
                        Name="PGUpdate|x64"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\pginstrument.vsprops"
+                       InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
                        CharacterSet="0"
                        WholeProgramOptimization="1"
                        >

diff --git a/PCbuild9/pyproject.vsprops b/PCbuild9/pyproject.vsprops
index 007804405c8c84ecc5161de07a63f24dc9ca51c7..95717e76653caadefef82c85489690aea2d92aff 100644 (file)
--- a/PCbuild9/pyproject.vsprops
+++ b/PCbuild9/pyproject.vsprops
@@ -12,7 +12,7 @@
                InlineFunctionExpansion="1"
                EnableIntrinsicFunctions="true"
                AdditionalIncludeDirectories="..\Include; ..\PC"
-               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
+               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_WIN32"
                StringPooling="true"
                ExceptionHandling="0"
                RuntimeLibrary="0"

diff --git a/PCbuild9/python.vcproj b/PCbuild9/python.vcproj
index 7efa98dabe212dbadafffa44fb9c20c980cfbfed..17b29a20788a9e3db024d45f24784af102f98018 100644 (file)
--- a/PCbuild9/python.vcproj
+++ b/PCbuild9/python.vcproj
@@ -318,7 +318,7 @@
                <Configuration
                        Name="PGInstrument|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"
@@ -392,7 +392,7 @@
                <Configuration
                        Name="PGInstrument|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"
@@ -468,7 +468,7 @@
                <Configuration
                        Name="PGUpdate|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"
@@ -542,7 +542,7 @@
                <Configuration
                        Name="PGUpdate|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"

diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild9/pythoncore.vcproj
index 16d16d0e98081ad593103ea99d37b986325912e5..e41688c98787f13f9c156d7de35f180412b5688e 100644 (file)
--- a/PCbuild9/pythoncore.vcproj
+++ b/PCbuild9/pythoncore.vcproj
@@ -326,7 +326,7 @@
                <Configuration
                        Name="PGInstrument|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        >
@@ -400,7 +400,7 @@
                <Configuration
                        Name="PGInstrument|x64"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        >
@@ -476,7 +476,7 @@
                <Configuration
                        Name="PGUpdate|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        >
@@ -550,7 +550,7 @@
                <Configuration
                        Name="PGUpdate|x64"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        >

diff --git a/PCbuild9/pythonw.vcproj b/PCbuild9/pythonw.vcproj
index 0013e9cbe92cf85dfb3981d84d77efbcc5a46391..add468420746b0538e7c5ae98e58bb08051bf29f 100644 (file)
--- a/PCbuild9/pythonw.vcproj
+++ b/PCbuild9/pythonw.vcproj
@@ -305,7 +305,7 @@
                <Configuration
                        Name="PGInstrument|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        >
@@ -377,7 +377,7 @@
                <Configuration
                        Name="PGInstrument|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        >
@@ -450,7 +450,7 @@
                <Configuration
                        Name="PGUpdate|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        >
@@ -522,7 +522,7 @@
                <Configuration
                        Name="PGUpdate|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        >

diff --git a/PCbuild9/readme.txt b/PCbuild9/readme.txt
index 791edb2a0aa4548e3c43e34daf19467df11be9de..fd3967af3a11a64dce1c200b7f6aeb4a72faa6e3 100644 (file)
--- a/PCbuild9/readme.txt
+++ b/PCbuild9/readme.txt
@@ -293,6 +293,31 @@ macro "Py_ENABLE_SHARED" to "Py_NO_ENABLE_SHARED". You may also have to
 change the "Runtime Library" from "Multi-threaded DLL (/MD)" to 
 "Multi-threaded (/MT)".
 
+Visual Studio properties
+------------------------
+
+The PCbuild9 solution makes heavy use of Visual Studio property files 
+(*.vsprops). The properties can be viewed and altered in the Property
+Manager (View -> Other Windows -> Property Manager).
+
+ * debug (debug macros)
+ * pginstrument (PGO)
+ * pgupdate (PGO)
+    +-- pginstrument
+ * pyd (python extension, release build)
+    +-- release
+    +-- pyproject
+ * pyd_d (python extension, debug build)
+    +-- debug
+    +-- pyproject
+ * pyproject (base settings for all projects)
+ * release (release macros)
+ * x64 (AMD64 / x64 platform specific settings)
+
+The pyproject propertyfile defines _WIN32 and x64 defines _WIN64 and _M_X64
+although the macros are set by the compiler, too. The GUI doesn't always know
+about the macros and confuse the user with false information.
+
 YOUR OWN EXTENSION DLLs
 -----------------------
 If you want to create your own extension module DLL, there's an example

diff --git a/PCbuild9/w9xpopen.vcproj b/PCbuild9/w9xpopen.vcproj
index 2397366b7929d5addc2c822128b6f09c7a8f98fa..9fcff7b6464053748eb42e0a339b64002ea561c0 100644 (file)
--- a/PCbuild9/w9xpopen.vcproj
+++ b/PCbuild9/w9xpopen.vcproj
@@ -285,7 +285,7 @@
                <Configuration
                        Name="PGInstrument|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"
@@ -353,7 +353,7 @@
                <Configuration
                        Name="PGInstrument|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"
@@ -423,7 +423,7 @@
                <Configuration
                        Name="PGUpdate|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"
@@ -491,7 +491,7 @@
                <Configuration
                        Name="PGUpdate|x64"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
                        CharacterSet="2"

diff --git a/PCbuild9/x64.vsprops b/PCbuild9/x64.vsprops
index acc332507a5cd1d139198eb231b733fd196fc8e9..c7eabbea46204e5e21fedc3b0c17e74452070c02 100644 (file)
--- a/PCbuild9/x64.vsprops
+++ b/PCbuild9/x64.vsprops
@@ -9,6 +9,7 @@
        <Tool
                Name="VCCLCompilerTool"
                AdditionalOptions="/USECL:MS_OPTERON /GS-"
+               PreprocessorDefinitions="_WIN64;_M_X64"
        />
        <Tool
                Name="VCLinkerTool"