diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj --- 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 --- 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) diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj --- 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 diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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,7 +201,6 @@ 0x1e1F0000 MachineX64 - $(SolutionDir)\$(PlatformShortName)\python33.lib;%(AdditionalDependencies) diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj --- 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 --- 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 --- a/PCbuild/debug.props +++ b/PCbuild/debug.props @@ -11,9 +11,6 @@ _DEBUG;%(PreprocessorDefinitions) - - $(OutDir)$(TargetName)$(TargetExt) - diff --git a/PCbuild/env.bat b/PCbuild/env.bat --- 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 --- 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 --- 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 --- 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 @@ $(SolutionDir)make_versioninfo.exe - $(TargetDir)$(TargetName).pdb Console 0x1d000000 @@ -151,7 +154,6 @@ $(SolutionDir)make_versioninfo_d.exe - $(TargetDir)$(TargetName).pdb Console 0x1d000000 diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -547,8 +547,9 @@ {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|x64 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|x64.ActiveCfg = Release|x64 + {F749B822-B489-4CA5-A3AD-CE078F5F338A}.Debug|x64.Build.0 = 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 --- a/PCbuild/pyd.props +++ b/PCbuild/pyd.props @@ -8,6 +8,7 @@ <_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 --- a/PCbuild/pyd_d.props +++ b/PCbuild/pyd_d.props @@ -13,7 +13,6 @@ false false .pyd - $(ProjectName)_d @@ -23,11 +22,7 @@ Py_BUILD_CORE_MODULE;%(PreprocessorDefinitions) MultiThreadedDebugDLL - - $(OutDir)$(ProjectName)_d.pyd - $(OutDir)$(ProjectName)_d.pdb - $(OutDir)$(TargetName).lib - + diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj --- 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 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -20,7 +20,6 @@ $(SolutionDir)\ $(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\ false - .dll diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj --- 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.props b/PCbuild/pythoncore.props new file mode 100644 --- /dev/null +++ b/PCbuild/pythoncore.props @@ -0,0 +1,10 @@ + + + + + + $(PyDllName) + + + + \ No newline at end of file diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -80,22 +80,26 @@ + + + + @@ -103,6 +107,7 @@ + @@ -110,18 +115,21 @@ + + + @@ -150,15 +158,6 @@ AllRules.ruleset - $(PyDllName)_d - $(PyDllName) - $(PyDllName)_d - $(PyDllName) - .dll - $(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/pythoncore_d.props b/PCbuild/pythoncore_d.props new file mode 100644 --- /dev/null +++ b/PCbuild/pythoncore_d.props @@ -0,0 +1,10 @@ + + + + + + $(PyDllName)_d + + + + \ No newline at end of file diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj --- 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 --- 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 @@ 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/select.vcxproj b/PCbuild/select.vcxproj --- 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 --- 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 --- 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 --- /dev/null +++ b/PCbuild/vs9to10.py @@ -0,0 +1,57 @@ +#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) + \ No newline at end of file diff --git a/PCbuild/w9xpopen.vcxproj b/PCbuild/w9xpopen.vcxproj --- a/PCbuild/w9xpopen.vcxproj +++ b/PCbuild/w9xpopen.vcxproj @@ -84,27 +84,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -148,12 +148,6 @@ AllRules.ruleset - .pyd - .pyd - .pyd - .pyd - .pyd - .pyd diff --git a/PCbuild/xxlimited.vcxproj b/PCbuild/xxlimited.vcxproj --- 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