[Python-checkins] r73593 - in python/branches/py3k: PC/VC6/pythoncore.dsp PC/VC6/readme.txt PC/VS7.1/pythoncore.vcproj PC/VS8.0/build_ssl.bat PC/VS8.0/kill_python.c PC/VS8.0/pyproject.vsprops PC/pyconfig.h PCbuild/kill_python.c PCbuild/pyproject.vsprops PCbuild/readme.txt

Sun Jun 28 01:00:59 CEST 2009

Author: martin.v.loewis
Date: Sun Jun 28 01:00:59 2009
New Revision: 73593
Log:
Bump Windows versions to 3.2.
Modified:
 python/branches/py3k/PC/VC6/pythoncore.dsp
 python/branches/py3k/PC/VC6/readme.txt
 python/branches/py3k/PC/VS7.1/pythoncore.vcproj
 python/branches/py3k/PC/VS8.0/build_ssl.bat
 python/branches/py3k/PC/VS8.0/kill_python.c
 python/branches/py3k/PC/VS8.0/pyproject.vsprops
 python/branches/py3k/PC/pyconfig.h
 python/branches/py3k/PCbuild/kill_python.c
 python/branches/py3k/PCbuild/pyproject.vsprops
 python/branches/py3k/PCbuild/readme.txt
Modified: python/branches/py3k/PC/VC6/pythoncore.dsp
==============================================================================

--- python/branches/py3k/PC/VC6/pythoncore.dsp	(original)
+++ python/branches/py3k/PC/VC6/pythoncore.dsp	Sun Jun 28 01:00:59 2009
@@ -54,7 +54,7 @@
 # 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 @@
 # 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 
Modified: python/branches/py3k/PC/VC6/readme.txt
==============================================================================
--- python/branches/py3k/PC/VC6/readme.txt	(original)
+++ python/branches/py3k/PC/VC6/readme.txt	Sun Jun 28 01:00:59 2009
@@ -13,7 +13,7 @@
 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 @@
 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
 -----------
Modified: python/branches/py3k/PC/VS7.1/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/pythoncore.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/pythoncore.vcproj	Sun Jun 28 01:00:59 2009
@@ -39,15 +39,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				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="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -99,15 +99,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="getbuildinfo.o"
-				OutputFile="./python31_d.dll"
+				OutputFile="./python32_d.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\./python31_d.pdb"
+				ProgramDatabaseFile=".\./python32_d.pdb"
 				SubSystem="2"
 				BaseAddress="0x1e000000"
-				ImportLibrary=".\./python31_d.lib"
+				ImportLibrary=".\./python32_d.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -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"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -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"/>
 			<Tool
 				Name="VCMIDLTool"/>
Modified: python/branches/py3k/PC/VS8.0/build_ssl.bat
==============================================================================
--- python/branches/py3k/PC/VS8.0/build_ssl.bat	(original)
+++ python/branches/py3k/PC/VS8.0/build_ssl.bat	Sun Jun 28 01:00:59 2009
@@ -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
Modified: python/branches/py3k/PC/VS8.0/kill_python.c
==============================================================================
--- python/branches/py3k/PC/VS8.0/kill_python.c	(original)
+++ python/branches/py3k/PC/VS8.0/kill_python.c	Sun Jun 28 01:00:59 2009
@@ -106,7 +106,7 @@
 /*
 * 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.
Modified: python/branches/py3k/PC/VS8.0/pyproject.vsprops
==============================================================================
--- python/branches/py3k/PC/VS8.0/pyproject.vsprops	(original)
+++ python/branches/py3k/PC/VS8.0/pyproject.vsprops	Sun Jun 28 01:00:59 2009
@@ -38,7 +38,7 @@
 	/>
 	<UserMacro
 		Name="PyDllName"
-		Value="python31"
+		Value="python32"
 	/>
 	<UserMacro
 		Name="PythonExe"
Modified: python/branches/py3k/PC/pyconfig.h
==============================================================================
--- python/branches/py3k/PC/pyconfig.h	(original)
+++ python/branches/py3k/PC/pyconfig.h	Sun Jun 28 01:00:59 2009
@@ -325,9 +325,9 @@
 			their Makefile (other compilers are generally
 			taken care of by distutils.) */
 #			ifdef _DEBUG
-#				pragma comment(lib,"python31_d.lib")
+#				pragma comment(lib,"python32_d.lib")
 #			else
-#				pragma comment(lib,"python31.lib")
+#				pragma comment(lib,"python32.lib")
 #			endif /* _DEBUG */
 #		endif /* _MSC_VER */
 #	endif /* Py_BUILD_CORE */
Modified: python/branches/py3k/PCbuild/kill_python.c
==============================================================================
--- python/branches/py3k/PCbuild/kill_python.c	(original)
+++ python/branches/py3k/PCbuild/kill_python.c	Sun Jun 28 01:00:59 2009
@@ -106,7 +106,7 @@
 /*
 * 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.
Modified: python/branches/py3k/PCbuild/pyproject.vsprops
==============================================================================
--- python/branches/py3k/PCbuild/pyproject.vsprops	(original)
+++ python/branches/py3k/PCbuild/pyproject.vsprops	Sun Jun 28 01:00:59 2009
@@ -38,7 +38,7 @@
 	/>
 	<UserMacro
 		Name="PyDllName"
-		Value="python31"
+		Value="python32"
 	/>
 	<UserMacro
 		Name="PythonExe"
Modified: python/branches/py3k/PCbuild/readme.txt
==============================================================================
--- python/branches/py3k/PCbuild/readme.txt	(original)
+++ python/branches/py3k/PCbuild/readme.txt	Sun Jun 28 01:00:59 2009
@@ -37,7 +37,7 @@
 running a Python core buildbot test slave; see SUBPROJECTS below)
 
 When using the Debug setting, the output files have a _d added to
-their name: python31_d.dll, python_d.exe, parser_d.pyd, and so on. Both
+their name: python32_d.dll, python_d.exe, parser_d.pyd, and so on. Both
 the build and rt batch files accept a -d option for debug builds.
 
 The 32bit builds end up in the solution folder PCbuild while the x64 builds
