Author: christian.heimes
Date: Wed Dec 5 23:02:31 2007
New Revision: 59376
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/ACKS.txt
python/branches/py3k/PCbuild9/bz2.vcproj
python/branches/py3k/PCbuild9/pgupdate.vsprops
python/branches/py3k/PCbuild9/pyexpat.vcproj
python/branches/py3k/PCbuild9/pyproject.vsprops
python/branches/py3k/PCbuild9/python.vcproj
python/branches/py3k/PCbuild9/pythoncore.vcproj
python/branches/py3k/PCbuild9/pythonw.vcproj
python/branches/py3k/PCbuild9/readme.txt
python/branches/py3k/PCbuild9/w9xpopen.vcproj
python/branches/py3k/PCbuild9/x64.vsprops
Log:
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.
........
Modified: python/branches/py3k/Doc/ACKS.txt
==============================================================================
--- python/branches/py3k/Doc/ACKS.txt (original)
+++ python/branches/py3k/Doc/ACKS.txt Wed Dec 5 23:02:31 2007
@@ -109,6 +109,7 @@
* Glyph Lefkowitz
* Robert Lehmann
* Marc-André Lemburg
+* Ross Light
* Ulf A. Lindgren
* Everett Lipman
* Mirko Liss
Modified: python/branches/py3k/PCbuild9/bz2.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/bz2.vcproj (original)
+++ python/branches/py3k/PCbuild9/bz2.vcproj Wed Dec 5 23:02:31 2007
@@ -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"
>
Modified: python/branches/py3k/PCbuild9/pgupdate.vsprops
==============================================================================
--- python/branches/py3k/PCbuild9/pgupdate.vsprops (original)
+++ python/branches/py3k/PCbuild9/pgupdate.vsprops Wed Dec 5 23:02:31 2007
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="pgoptimize"
+ Name="pgupdate"
OutputDirectory="$(SolutionDir)$(PlatformName)-pgo\"
InheritedPropertySheets="$(SolutionDir)\pginstrument.vsprops"
>
Modified: python/branches/py3k/PCbuild9/pyexpat.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/pyexpat.vcproj (original)
+++ python/branches/py3k/PCbuild9/pyexpat.vcproj Wed Dec 5 23:02:31 2007
@@ -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"
>
Modified: python/branches/py3k/PCbuild9/pyproject.vsprops
==============================================================================
--- python/branches/py3k/PCbuild9/pyproject.vsprops (original)
+++ python/branches/py3k/PCbuild9/pyproject.vsprops Wed Dec 5 23:02:31 2007
@@ -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"
Modified: python/branches/py3k/PCbuild9/python.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/python.vcproj (original)
+++ python/branches/py3k/PCbuild9/python.vcproj Wed Dec 5 23:02:31 2007
@@ -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"
Modified: python/branches/py3k/PCbuild9/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/pythoncore.vcproj (original)
+++ python/branches/py3k/PCbuild9/pythoncore.vcproj Wed Dec 5 23:02:31 2007
@@ -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"
>
Modified: python/branches/py3k/PCbuild9/pythonw.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/pythonw.vcproj (original)
+++ python/branches/py3k/PCbuild9/pythonw.vcproj Wed Dec 5 23:02:31 2007
@@ -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"
>
Modified: python/branches/py3k/PCbuild9/readme.txt
==============================================================================
--- python/branches/py3k/PCbuild9/readme.txt (original)
+++ python/branches/py3k/PCbuild9/readme.txt Wed Dec 5 23:02:31 2007
@@ -293,6 +293,31 @@
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
Modified: python/branches/py3k/PCbuild9/w9xpopen.vcproj
==============================================================================
--- python/branches/py3k/PCbuild9/w9xpopen.vcproj (original)
+++ python/branches/py3k/PCbuild9/w9xpopen.vcproj Wed Dec 5 23:02:31 2007
@@ -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"
Modified: python/branches/py3k/PCbuild9/x64.vsprops
==============================================================================
--- python/branches/py3k/PCbuild9/x64.vsprops (original)
+++ python/branches/py3k/PCbuild9/x64.vsprops Wed Dec 5 23:02:31 2007
@@ -9,6 +9,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/USECL:MS_OPTERON /GS-"
+ PreprocessorDefinitions="_WIN64;_M_X64"
/>
<Tool
Name="VCLinkerTool"
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
