From 40e41bb77c93b5f622f305e62c4e2177384f1f6c Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Sun, 13 May 2012 16:16:09 -0500 Subject: changeset: 76969:0cbe1099226d branch: vs2010 tag: tip user: Brian Curtin date: Sun May 13 16:15:11 2012 -0500 summary: Changes to allow Profile Guided Optimization builds to succeed on VS2010 --- PCbuild/_bz2.vcxproj | 4 ++++ PCbuild/_ctypes.vcxproj | 22 ++++++++++++++++++++++ PCbuild/_ctypes_test.vcxproj | 4 ++++ PCbuild/_decimal.vcxproj | 22 ++++++++++++++++++++++ PCbuild/_elementtree.vcxproj | 4 ++++ PCbuild/_hashlib.vcxproj | 4 ++++ PCbuild/_lzma.vcxproj | 4 ++++ PCbuild/_msi.vcxproj | 4 ++++ PCbuild/_multiprocessing.vcxproj | 4 ++++ PCbuild/_socket.vcxproj | 4 ++++ PCbuild/_sqlite3.vcxproj | 4 ++++ PCbuild/_ssl.vcxproj | 4 ++++ PCbuild/_testbuffer.vcxproj | 23 +++++++++++++++++++++++ PCbuild/_testcapi.vcxproj | 4 ++++ PCbuild/_tkinter.vcxproj | 4 ++++ PCbuild/kill_python.vcxproj | 2 ++ PCbuild/pcbuild.sln | 12 ++++++------ PCbuild/pyexpat.vcxproj | 4 ++++ PCbuild/python.vcxproj | 4 ++++ PCbuild/pythoncore.vcxproj | 5 +++++ PCbuild/pythonw.vcxproj | 4 ++++ PCbuild/select.vcxproj | 4 ++++ PCbuild/sqlite3.vcxproj | 2 ++ PCbuild/unicodedata.vcxproj | 4 ++++ PCbuild/winsound.vcxproj | 4 ++++ PCbuild/xxlimited.vcxproj | 13 +++++++++++-- 26 files changed, 165 insertions(+), 8 deletions(-) diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj index d197597..8350d35 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj index c686650..9a081b1 100644 --- a/PCbuild/_ctypes.vcxproj +++ b/PCbuild/_ctypes.vcxproj @@ -83,9 +83,13 @@ + + + + @@ -97,9 +101,15 @@ + + + + + + @@ -140,6 +150,16 @@ .pyd .pyd + .pyd + $(SolutionDir)$(PlatformName)-pgo\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + $(SolutionDir)$(PlatformName)-pgo\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + .pyd + $(OutDirPGI)\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + .pyd + .pyd @@ -207,6 +227,7 @@ NotSet 0x1D1A0000 MachineX64 + $(OutDir)python33.lib;%(AdditionalDependencies) @@ -231,6 +252,7 @@ NotSet 0x1D1A0000 MachineX64 + $(SolutionDir)\$(PlatformShortName)\python33.lib;%(AdditionalDependencies) diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj index 27ff37a..ae7346b 100644 --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj index fef408d..ec5c891 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -83,9 +83,13 @@ + + + + @@ -97,9 +101,15 @@ + + + + + + @@ -140,6 +150,16 @@ .pyd $(SolutionDir)\amd64\ $(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\ + .pyd + $(SolutionDir)$(PlatformName)-pgo\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + $(SolutionDir)$(PlatformName)-pgo\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + .pyd + $(OutDirPGI)\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + .pyd + .pyd @@ -209,6 +229,7 @@ NotSet 0x1D1A0000 MachineX64 + $(OutDir)python33.lib;%(AdditionalDependencies) @@ -233,6 +254,7 @@ NotSet 0x1D1A0000 MachineX64 + $(SolutionDir)\$(PlatformShortName)\python33.lib;%(AdditionalDependencies) diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj index 3f51336..e10c605 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj index 4d64321..674270d 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -149,6 +149,10 @@ .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj index a242de4..fce672a 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_msi.vcxproj b/PCbuild/_msi.vcxproj index f5279a6..258d926 100644 --- a/PCbuild/_msi.vcxproj +++ b/PCbuild/_msi.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj index 1e060ac..20261e9 100644 --- a/PCbuild/_multiprocessing.vcxproj +++ b/PCbuild/_multiprocessing.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj index 5c9bb5f..2409805 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj index 7991ff9..bcaf2d3 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj index a539b4a..02ec236 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -149,6 +149,10 @@ .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj index 4854fe0..8403048 100644 --- a/PCbuild/_testbuffer.vcxproj +++ b/PCbuild/_testbuffer.vcxproj @@ -83,9 +83,13 @@ + + + + @@ -97,9 +101,15 @@ + + + + + + @@ -140,6 +150,17 @@ .pyd .pyd + .pyd + $(SolutionDir)$(PlatformName)-pgo\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + $(SolutionDir)$(PlatformName)-pgo\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + .pyd + $(OutDirPGI)\ + $(ProjectName) + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + .pyd + .pyd @@ -181,6 +202,7 @@ 0x1e1F0000 MachineX64 + $(OutDir)python33.lib;%(AdditionalDependencies) @@ -195,6 +217,7 @@ 0x1e1F0000 MachineX64 + $(SolutionDir)\$(PlatformShortName)\python33.lib;%(AdditionalDependencies) diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj index f871c55..e8e5b3c 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj index fb71041..64a6f58 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -149,6 +149,10 @@ .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/kill_python.vcxproj b/PCbuild/kill_python.vcxproj index b6d2144..f567f37 100644 --- a/PCbuild/kill_python.vcxproj +++ b/PCbuild/kill_python.vcxproj @@ -86,6 +86,8 @@ .exe .exe .exe + $(SolutionDir)$(PlatformName)-pgo\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 97bcecc..a98267b 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -551,12 +551,12 @@ Global {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|Win32.Build.0 = Debug|Win32 {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|x64.ActiveCfg = Debug|x64 {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|x64.Build.0 = Debug|x64 - {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGInstrument|Win32.ActiveCfg = Release|Win32 - {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGInstrument|Win32.Build.0 = Release|Win32 - {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGInstrument|x64.ActiveCfg = Release|x64 - {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGInstrument|x64.Build.0 = Release|x64 - {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGUpdate|Win32.ActiveCfg = Release|Win32 - {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGUpdate|Win32.Build.0 = Release|Win32 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGUpdate|x64.ActiveCfg = Release|x64 {F749B822-B489-4CA5-A3AD-CE078F5F338A}.PGUpdate|x64.Build.0 = Release|x64 {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj index db42129..593600c 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index 8b551e2..50db55e 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -160,6 +160,10 @@ .exe .exe .exe + .exe + .exe + .exe + .exe diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 3d96b10..c8985cf 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -154,6 +154,11 @@ $(PyDllName) $(PyDllName)_d $(PyDllName) + .dll + $(PyDllName) + $(PyDllName) + $(PyDllName) + $(PyDllName) diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj index c85e2e4..5db5506 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -153,6 +153,10 @@ .exe .exe .pyd + .exe + .exe + .exe + .exe diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj index 7598b5b..7c90a78 100644 --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj index 1ce080b..c7eb2a7 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -151,6 +151,8 @@ .dll + .dll + .dll diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj index 5dc92e8..c3244f5 100644 --- a/PCbuild/unicodedata.vcxproj +++ b/PCbuild/unicodedata.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj index c373a11..41e97f1 100644 --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -150,6 +150,10 @@ .pyd .pyd + .pyd + .pyd + .pyd + .pyd diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj index b25034e..241177f 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -119,6 +119,12 @@ .pyd .pyd + $(SolutionDir)$(PlatformName)-pgo\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + $(OutDirPGI)\ + $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ + .pyd + .pyd @@ -128,6 +134,7 @@ wsock32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 + $(OutDir)$(ProjectName).pyd @@ -135,7 +142,7 @@ X64 - wsock32.lib;$(OutDir)python33.lib;%(AdditionalDependencies) + wsock32.lib;$(SolutionDir)\$(PlatformShortName)\python33.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -148,6 +155,7 @@ wsock32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 + $(OutDirPGI)$(ProjectName).pyd @@ -155,10 +163,11 @@ X64 - wsock32.lib;%(AdditionalDependencies) + wsock32.lib;$(OutDir)python33.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 MachineX64 + $(OutDirPGI)$(ProjectName).pyd -- cgit v0.12