From c45ea9ebc774d46260230a76e5b8c3c1de020250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= Date: Sat, 19 May 2012 21:10:14 +0000 Subject: Clean up the PCBuild project files, removing redundant settings and use "references" to link to dependent projects. Update readme and batch files. --- PCbuild/_bz2.vcxproj | 6 ----- PCbuild/_ctypes.vcxproj | 21 ++++----------- PCbuild/_ctypes_test.vcxproj | 7 ----- PCbuild/_decimal.vcxproj | 21 +++++---------- PCbuild/_elementtree.vcxproj | 6 ----- PCbuild/_hashlib.vcxproj | 5 ---- PCbuild/_lzma.vcxproj | 6 ----- PCbuild/_msi.vcxproj | 6 ----- PCbuild/_multiprocessing.vcxproj | 6 ----- PCbuild/_socket.vcxproj | 6 ----- PCbuild/_sqlite3.vcxproj | 6 ----- PCbuild/_ssl.vcxproj | 5 ---- PCbuild/_testbuffer.vcxproj | 22 ++++------------ PCbuild/_testcapi.vcxproj | 6 ----- PCbuild/_tkinter.vcxproj | 5 ---- PCbuild/debug.props | 7 ++--- PCbuild/env.bat | 8 ++++-- PCbuild/kill_python.vcxproj | 6 ----- PCbuild/make_buildinfo.vcxproj | 2 -- PCbuild/make_versioninfo.vcxproj | 10 ++++--- PCbuild/pcbuild.sln | 4 +-- PCbuild/pyd.props | 6 ++--- PCbuild/pyd_d.props | 18 +++---------- PCbuild/pyexpat.vcxproj | 6 ----- PCbuild/pyproject.props | 11 +++++--- PCbuild/python.vcxproj | 8 ------ PCbuild/pythoncore.vcxproj | 46 ++++++++++----------------------- PCbuild/pythonw.vcxproj | 8 ------ PCbuild/readme.txt | 18 +++++-------- PCbuild/release.props | 6 ++--- PCbuild/select.vcxproj | 6 ----- PCbuild/sqlite3.vcxproj | 3 --- PCbuild/unicodedata.vcxproj | 6 ----- PCbuild/vs9to10.py | 56 ++++++++++++++++++++++++++++++++++++++++ PCbuild/w9xpopen.vcxproj | 24 +++++++++++++++++ PCbuild/winsound.vcxproj | 6 ----- PCbuild/x64.props | 2 +- PCbuild/xxlimited.vcxproj | 18 +++++-------- 38 files changed, 159 insertions(+), 260 deletions(-) create mode 100644 PCbuild/vs9to10.py diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj index 8350d35..9387e54 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj index 9a081b1..202cb1f 100644 --- a/PCbuild/_ctypes.vcxproj +++ b/PCbuild/_ctypes.vcxproj @@ -148,18 +148,6 @@ AllRules.ruleset - .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 @@ -178,7 +166,6 @@ 0x1D1A0000 - $(OutDir)python33_d.lib;%(AdditionalDependencies) @@ -202,7 +189,6 @@ /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) NotSet 0x1D1A0000 - $(OutDir)python33.lib;%(AdditionalDependencies) @@ -227,7 +213,6 @@ NotSet 0x1D1A0000 MachineX64 - $(OutDir)python33.lib;%(AdditionalDependencies) @@ -252,7 +237,6 @@ NotSet 0x1D1A0000 MachineX64 - $(SolutionDir)\$(PlatformShortName)\python33.lib;%(AdditionalDependencies) @@ -299,6 +283,11 @@ $(IntDir)win64.obj;%(Outputs) + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + + diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj index ae7346b..35e299b 100644 --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd @@ -190,7 +184,6 @@ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj index ec5c891..97b737a 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -113,6 +113,8 @@ + + @@ -146,20 +148,6 @@ AllRules.ruleset - .pyd - .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 @@ -313,6 +301,11 @@ $(IntDir)vcdiv64.obj;%(Outputs) + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + + diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj index e10c605..7802ab3 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj index 674270d..52433ed 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -148,11 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj index fce672a..ac25c80 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_msi.vcxproj b/PCbuild/_msi.vcxproj index 258d926..1323d16 100644 --- a/PCbuild/_msi.vcxproj +++ b/PCbuild/_msi.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj index 20261e9..b4bb568 100644 --- a/PCbuild/_multiprocessing.vcxproj +++ b/PCbuild/_multiprocessing.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj index 2409805..63836e9 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj index bcaf2d3..392dad1 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj index 02ec236..ae71d19 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -148,11 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj index 8403048..e1265f6 100644 --- a/PCbuild/_testbuffer.vcxproj +++ b/PCbuild/_testbuffer.vcxproj @@ -148,19 +148,6 @@ AllRules.ruleset - .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 @@ -173,7 +160,6 @@ 0x1e1F0000 - $(OutDir)python33_d.lib;%(AdditionalDependencies) @@ -187,7 +173,6 @@ 0x1e1F0000 - $(OutDir)python33.lib;%(AdditionalDependencies) @@ -202,7 +187,6 @@ 0x1e1F0000 MachineX64 - $(OutDir)python33.lib;%(AdditionalDependencies) @@ -217,12 +201,16 @@ 0x1e1F0000 MachineX64 - $(SolutionDir)\$(PlatformShortName)\python33.lib;%(AdditionalDependencies) + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + + diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj index e8e5b3c..e99a7e4 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj index 64a6f58..67f72fe 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -148,11 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/debug.props b/PCbuild/debug.props index c36ab56..ce8aad4 100644 --- a/PCbuild/debug.props +++ b/PCbuild/debug.props @@ -1,6 +1,7 @@  + _d $(OutDir)kill_python_d.exe @@ -11,11 +12,11 @@ _DEBUG;%(PreprocessorDefinitions) - - $(OutDir)$(TargetName)$(TargetExt) - + + $(PyDebugExt) + $(KillPythonExe) diff --git a/PCbuild/env.bat b/PCbuild/env.bat index 638b16c..08dc8ef 100644 --- a/PCbuild/env.bat +++ b/PCbuild/env.bat @@ -1,5 +1,9 @@ @echo off -set VS9=%ProgramFiles%\Microsoft Visual Studio 9.0 +set VS10=%ProgramFiles(x86)%\Microsoft Visual Studio 10.0 +IF EXIST "%VS10%" GOTO ok +set VS10=%ProgramFiles%\Microsoft Visual Studio 10.0 +:ok + echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64 echo. -call "%VS9%\VC\vcvarsall.bat" %1 +call "%VS10%\VC\vcvarsall.bat" %1 diff --git a/PCbuild/kill_python.vcxproj b/PCbuild/kill_python.vcxproj index f567f37..9f67c40 100644 --- a/PCbuild/kill_python.vcxproj +++ b/PCbuild/kill_python.vcxproj @@ -82,12 +82,6 @@ AllRules.ruleset - .exe - .exe - .exe - .exe - $(SolutionDir)$(PlatformName)-pgo\ - $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ diff --git a/PCbuild/make_buildinfo.vcxproj b/PCbuild/make_buildinfo.vcxproj index 35a2b0a..eee7f91 100644 --- a/PCbuild/make_buildinfo.vcxproj +++ b/PCbuild/make_buildinfo.vcxproj @@ -30,7 +30,6 @@ AllRules.ruleset - .exe @@ -41,7 +40,6 @@ $(OutDir)make_buildinfo.exe - $(TargetDir)$(TargetName).pdb Console diff --git a/PCbuild/make_versioninfo.vcxproj b/PCbuild/make_versioninfo.vcxproj index 6e35ef4..a855287 100644 --- a/PCbuild/make_versioninfo.vcxproj +++ b/PCbuild/make_versioninfo.vcxproj @@ -54,9 +54,15 @@ + + + + + + @@ -73,8 +79,6 @@ AllRules.ruleset - .exe - .exe @@ -97,7 +101,6 @@ make_versioninfo.exe > ..\PC\pythonnt_rc.h $(SolutionDir)make_versioninfo.exe - $(TargetDir)$(TargetName).pdb Console 0x1d000000 @@ -151,7 +154,6 @@ make_versioninfo_d.exe > ..\PC\pythonnt_rc_d.h $(SolutionDir)make_versioninfo_d.exe - $(TargetDir)$(TargetName).pdb Console 0x1d000000 diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 0eb0d6b..6d6c3ac 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -547,8 +547,8 @@ Global {885D4898-D08D-4091-9C40-C700CFE3FC5A}.Release|Win32.Build.0 = Release|Win32 {885D4898-D08D-4091-9C40-C700CFE3FC5A}.Release|x64.ActiveCfg = Release|x64 {885D4898-D08D-4091-9C40-C700CFE3FC5A}.Release|x64.Build.0 = Release|x64 - {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|Win32.ActiveCfg = Debug|Win32 - {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|x64.ActiveCfg = Debug|x64 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|Win32.ActiveCfg = Release|Win32 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|x64.ActiveCfg = Release|x64 {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 diff --git a/PCbuild/pyd.props b/PCbuild/pyd.props index fe58a1c..469966e 100644 --- a/PCbuild/pyd.props +++ b/PCbuild/pyd.props @@ -1,13 +1,14 @@  - + <_ProjectFileVersion>10.0.30319.1 false false + .pyd @@ -15,9 +16,6 @@ MultiThreadedDLL - $(OutDir)$(ProjectName).pyd - $(OutDir)$(ProjectName).pdb - $(OutDir)$(TargetName).lib diff --git a/PCbuild/pyd_d.props b/PCbuild/pyd_d.props index 7571998..b023288 100644 --- a/PCbuild/pyd_d.props +++ b/PCbuild/pyd_d.props @@ -1,12 +1,10 @@  - + - - $(SolutionDir)python_d.exe - + <_ProjectFileVersion>10.0.30319.1 false @@ -23,19 +21,11 @@ Py_BUILD_CORE_MODULE;%(PreprocessorDefinitions) MultiThreadedDebugDLL - - $(OutDir)$(ProjectName)_d.pyd - $(OutDir)$(ProjectName)_d.pdb - $(OutDir)$(TargetName).lib - + - - - $(PythonExe) - - + \ No newline at end of file diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj index 593600c..974fd3d 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index f466a07..fba778a 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -1,8 +1,9 @@  - python33 - $(SolutionDir)\python.exe + python33$(PyDebugExt) + $(SolutionDir)python$(PyDebugExt).exe + $(OutDir)kill_python$(PyDebugExt).exe ..\.. $(externalsDir)\sqlite-3.7.12 $(externalsDir)\bzip2-1.0.6 @@ -17,10 +18,9 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)\ + $(SolutionDir) $(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\ false - .dll @@ -59,6 +59,9 @@ $(PythonExe) + + $(KillPythonExe) + $(externalsDir) diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index 50db55e..d0a9de0 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -156,14 +156,6 @@ AllRules.ruleset - .exe - .exe - .exe - .exe - .exe - .exe - .exe - .exe diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index fd4a254..fd8861d 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -77,51 +77,51 @@ - + - + - + - + + - + - + - + - @@ -150,15 +150,14 @@ AllRules.ruleset - $(PyDllName)_d - $(PyDllName) - $(PyDllName)_d - $(PyDllName) - .dll - $(PyDllName) - $(PyDllName) + $(PyDllName) $(PyDllName) + $(PyDllName) + $(PyDllName) + $(PyDllName) $(PyDllName) + $(PyDllName) + $(PyDllName) @@ -180,9 +179,7 @@ $(IntDir)getbuildinfo.o;%(AdditionalDependencies) $(OutDir)$(PyDllName).dll libc;%(IgnoreSpecificDefaultLibraries) - $(OutDir)$(PyDllName).pdb 0x1e000000 - $(OutDir)$(PyDllName).lib @@ -208,9 +205,7 @@ $(IntDir)getbuildinfo.o;%(AdditionalDependencies) $(OutDir)$(PyDllName).dll libc;%(IgnoreSpecificDefaultLibraries) - $(OutDir)$(PyDllName).pdb 0x1e000000 - $(OutDir)$(PyDllName).lib @@ -234,11 +229,8 @@ $(IntDir)getbuildinfo.o;%(AdditionalDependencies) - $(OutDir)$(PyDllName)_d.dll libc;%(IgnoreSpecificDefaultLibraries) - $(OutDir)$(PyDllName)_d.pdb 0x1e000000 - $(OutDir)$(PyDllName)_d.lib @@ -267,9 +259,7 @@ $(IntDir)getbuildinfo.o;%(AdditionalDependencies) $(OutDir)$(PyDllName)_d.dll libc;%(IgnoreSpecificDefaultLibraries) - $(OutDir)$(PyDllName)_d.pdb 0x1e000000 - $(OutDir)$(PyDllName)_d.lib @@ -292,9 +282,7 @@ $(IntDir)getbuildinfo.o;%(AdditionalDependencies) $(OutDir)$(PyDllName).dll libc;%(IgnoreSpecificDefaultLibraries) - $(OutDir)$(PyDllName).pdb 0x1e000000 - $(OutDirPGI)$(PyDllName).lib @@ -320,9 +308,7 @@ $(IntDir)getbuildinfo.o;%(AdditionalDependencies) $(OutDir)$(PyDllName).dll libc;%(IgnoreSpecificDefaultLibraries) - $(OutDir)$(PyDllName).pdb 0x1e000000 - $(OutDirPGI)$(PyDllName).lib MachineX64 @@ -346,9 +332,7 @@ $(IntDir)getbuildinfo.o;%(AdditionalDependencies) $(OutDir)$(PyDllName).dll libc;%(IgnoreSpecificDefaultLibraries) - $(OutDir)$(PyDllName).pdb 0x1e000000 - $(OutDirPGI)$(PyDllName).lib @@ -374,9 +358,7 @@ $(IntDir)getbuildinfo.o;%(AdditionalDependencies) $(OutDir)$(PyDllName).dll libc;%(IgnoreSpecificDefaultLibraries) - $(OutDir)$(PyDllName).pdb 0x1e000000 - $(OutDirPGI)$(PyDllName).lib MachineX64 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj index 5db5506..1214569 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -149,14 +149,6 @@ AllRules.ruleset - .exe - .exe - .exe - .pyd - .exe - .exe - .exe - .exe diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index fe22929..e749429 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -1,4 +1,4 @@ -Building Python using VC++ 9.0 +Building Python using VC++ 10.0 ------------------------------ This directory is used to build Python for Win32 and x64 platforms, e.g. @@ -62,17 +62,11 @@ PC/VS8.0/ C RUNTIME --------- -Visual Studio 2008 uses version 9 of the C runtime (MSVCRT9). The executables -are linked to a CRT "side by side" assembly which must be present on the target -machine. This is avalible under the VC/Redist folder of your visual studio -distribution. On XP and later operating systems that support -side-by-side assemblies it is not enough to have the msvcrt90.dll present, -it has to be there as a whole assembly, that is, a folder with the .dll -and a .manifest. Also, a check is made for the correct version. -Therefore, one should distribute this assembly with the dlls, and keep -it in the same directory. For compatibility with older systems, one should -also set the PATH to this directory so that the dll can be found. -For more info, see the Readme in the VC/Redist folder. +Visual Studio 2010 uses version 10 of the C runtime (MSVCRT9). The executables +no longer use the "Side by Side" assemblies used in previous versions of the +compiler. This simplifies distribution of applications. +The run time libraries are avalible under the VC/Redist folder of your visual studio +distribution. For more info, see the Readme in the VC/Redist folder. SUBPROJECTS ----------- diff --git a/PCbuild/release.props b/PCbuild/release.props index 356f53d..acfe3e4 100644 --- a/PCbuild/release.props +++ b/PCbuild/release.props @@ -1,7 +1,7 @@  - $(OutDir)kill_python.exe + <_ProjectFileVersion>10.0.30319.1 @@ -12,8 +12,8 @@ - - $(KillPythonExe) + + $(PyDebugExt) \ No newline at end of file diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj index 7c90a78..514923c 100644 --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj index c7eb2a7..daf010d 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -150,9 +150,6 @@ AllRules.ruleset - .dll - .dll - .dll diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj index c3244f5..c9d5278 100644 --- a/PCbuild/unicodedata.vcxproj +++ b/PCbuild/unicodedata.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/vs9to10.py b/PCbuild/vs9to10.py new file mode 100644 index 0000000..8bf832a --- /dev/null +++ b/PCbuild/vs9to10.py @@ -0,0 +1,56 @@ +#Run this file after automatic convertsion of the VisualStudio 2008 solution by VisualStudio 2010. +#This can be done whenever the 2008 solution changes. +#It will make the necessary cleanup and updates to the vcxproj files +#the .props files need to be maintained by hand if the .vsprops files change + +from __future__ import with_statement +import sys +import os +import os.path + +def vs9to10(src, dest): + for name in os.listdir(src): + path, ext = os.path.splitext(name) + if ext.lower() not in ('.vcxproj',): + continue + + filename = os.path.normpath(os.path.join(src, name)) + destname = os.path.normpath(os.path.join(dest, name)) + print("%s -> %s" % (filename, destname)) + + lines = [] + lastline = b"" + importgroup = False + with open(filename, 'rb') as fin: + for line in fin: + #remove redundant linker output info + if b"" in line: + continue + if b"" in line: + continue + if b"" in line and b"" in line: + continue + + #add new property sheet to the pythoncore + if importgroup and "pythoncore" in name.lower(): + if b"" in line: + if b"debug.props" in lastline: + lines.append(b' \r\n') + elif b"pythoncore" not in lastline: + lines.append(b' \r\n') + if b"" in line: + importgroup = False + lines.append(line) + lastline = line + with open(destname, 'wb') as fout: + for line in lines: + fout.write(line) + +if __name__ == "__main__": + src = "." if len(sys.argv) < 2 else sys.argv[1] + name = os.path.basename(os.path.abspath(src)) + dest = os.path.abspath(os.path.join(src, "..", name + "Upd")) + os.makedirs(dest) + vs9to10(src, dest) diff --git a/PCbuild/w9xpopen.vcxproj b/PCbuild/w9xpopen.vcxproj index 66c9e67..d1afe22 100644 --- a/PCbuild/w9xpopen.vcxproj +++ b/PCbuild/w9xpopen.vcxproj @@ -84,27 +84,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj index 41e97f1..cf518e9 100644 --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/x64.props b/PCbuild/x64.props index e43ff9d..5f26e68 100644 --- a/PCbuild/x64.props +++ b/PCbuild/x64.props @@ -6,7 +6,7 @@ <_ProjectFileVersion>10.0.30319.1 <_PropertySheetDisplayName>amd64 - $(SolutionDir)\amd64\ + $(SolutionDir)amd64\ $(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\ diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj index fa32264..26bc20d 100644 --- a/PCbuild/xxlimited.vcxproj +++ b/PCbuild/xxlimited.vcxproj @@ -117,12 +117,6 @@ AllRules.ruleset - .pyd - .pyd - $(SolutionDir)$(PlatformName)-pgo\ - $(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\ - .pyd - .pyd @@ -132,7 +126,6 @@ wsock32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 - $(OutDir)$(ProjectName).pyd @@ -140,7 +133,7 @@ X64 - wsock32.lib;$(SolutionDir)\$(PlatformShortName)\python33.lib;%(AdditionalDependencies) + wsock32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 @@ -153,7 +146,6 @@ wsock32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 - $(OutDirPGI)$(ProjectName).pyd @@ -161,11 +153,10 @@ X64 - wsock32.lib;$(OutDir)python33.lib;%(AdditionalDependencies) + wsock32.lib;%(AdditionalDependencies) libc;%(IgnoreSpecificDefaultLibraries) 0x1D110000 MachineX64 - $(OutDirPGI)$(ProjectName).pyd @@ -192,6 +183,11 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + + -- cgit v0.12