From f7a6b508ceee3eb614f9fa8ea89d9fbf86e84f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 27 Jun 2009 23:00:59 +0000 Subject: Bump Windows versions to 3.2. --- PC/VC6/pythoncore.dsp | 4 ++-- PC/VC6/readme.txt | 4 ++-- PC/VS7.1/pythoncore.vcproj | 24 ++++++++++++------------ PC/VS8.0/build_ssl.bat | 4 ++-- PC/VS8.0/kill_python.c | 2 +- PC/VS8.0/pyproject.vsprops | 2 +- PC/pyconfig.h | 4 ++-- PCbuild/kill_python.c | 2 +- PCbuild/pyproject.vsprops | 2 +- PCbuild/readme.txt | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index 91c522c..2ac611f 100644 --- a/PC/VC6/pythoncore.dsp +++ b/PC/VC6/pythoncore.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python31.dll" +# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python32.dll" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python31_d.dll" /pdbtype:sept +# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python32_d.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index 0645fa3..98b3315 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -13,7 +13,7 @@ and build the projects. The proper order to build subprojects: 1) pythoncore (this builds the main Python DLL and library files, - python31.{dll, lib} in Release mode) + python32.{dll, lib} in Release mode) 2) python (this builds the main Python executable, python.exe in Release mode) @@ -24,7 +24,7 @@ The proper order to build subprojects: to the subsystems they implement; see SUBPROJECTS below) When using the Debug setting, the output files have a _d added to -their name: python31_d.dll, python_d.exe, pyexpat_d.pyd, and so on. +their name: python32_d.dll, python_d.exe, pyexpat_d.pyd, and so on. SUBPROJECTS ----------- diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj index 4a6ed1a..b5ee947 100644 --- a/PC/VS7.1/pythoncore.vcproj +++ b/PC/VS7.1/pythoncore.vcproj @@ -39,15 +39,15 @@ @@ -99,15 +99,15 @@ @@ -166,15 +166,15 @@ Name="VCLinkerTool" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python31.dll" + OutputFile="./python32.dll" LinkIncremental="1" SuppressStartupBanner="FALSE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python31.pdb" + ProgramDatabaseFile=".\./python32.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python31.lib" + ImportLibrary=".\./python32.lib" TargetMachine="0"/> @@ -233,15 +233,15 @@ Name="VCLinkerTool" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python31.dll" + OutputFile="./python32.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python31.pdb" + ProgramDatabaseFile=".\./python32.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python31.lib" + ImportLibrary=".\./python32.lib" TargetMachine="0"/> diff --git a/PC/VS8.0/build_ssl.bat b/PC/VS8.0/build_ssl.bat index 4effc6f..29a1d81 100644 --- a/PC/VS8.0/build_ssl.bat +++ b/PC/VS8.0/build_ssl.bat @@ -2,10 +2,10 @@ if not defined HOST_PYTHON ( if %1 EQU Debug ( set HOST_PYTHON=python_d.exe - if not exist python31_d.dll exit 1 + if not exist python32_d.dll exit 1 ) ELSE ( set HOST_PYTHON=python.exe - if not exist python31.dll exit 1 + if not exist python32.dll exit 1 ) ) %HOST_PYTHON% build_ssl.py %1 %2 %3 diff --git a/PC/VS8.0/kill_python.c b/PC/VS8.0/kill_python.c index 17a5f32..6b91678 100644 --- a/PC/VS8.0/kill_python.c +++ b/PC/VS8.0/kill_python.c @@ -106,7 +106,7 @@ main(int argc, char **argv) /* * XXX TODO: if we really wanted to be fancy, we could check the * modules for all processes (not just the python[_d].exe ones) - * and see if any of our DLLs are loaded (i.e. python31[_d].dll), + * and see if any of our DLLs are loaded (i.e. python32[_d].dll), * as that would also inhibit our ability to rebuild the solution. * Not worth loosing sleep over though; for now, a simple check * for just the python executable should be sufficient. diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index 1ba124f..5e4cde9 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -38,7 +38,7 @@ />