Bump Windows versions to 3.2.

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 91c522c6c1775f6df4f8c169dca534c5ed19b97d..2ac611f8bf1a3e6a0085431ab7beabab04fed892 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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"\r
+# 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"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"\r
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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\r
+# 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\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index 0645fa3cb93b87e1dad136a664575d762abc856e..98b33153035dc399ba6e9ee8aaea57061d531788 100644 (file)
--- 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 4a6ed1aff99ceb27b737be5de616830f6884000f..b5ee947da9eff8628c8908550b101245d1ceacd8 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -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"/>

diff --git a/PC/VS8.0/build_ssl.bat b/PC/VS8.0/build_ssl.bat
index 4effc6fcd17bf1e396caf1919cb176f028d5972b..29a1d81e0009b2f90aa9e177dd7d994fe916e29f 100644 (file)
--- a/PC/VS8.0/build_ssl.bat
+++ b/PC/VS8.0/build_ssl.bat
@@ -2,10 +2,10 @@
 if not defined HOST_PYTHON (\r
   if %1 EQU Debug (\r
     set HOST_PYTHON=python_d.exe\r
-    if not exist python31_d.dll exit 1\r
+    if not exist python32_d.dll exit 1\r
   ) ELSE (\r
     set HOST_PYTHON=python.exe\r
-    if not exist python31.dll exit 1\r
+    if not exist python32.dll exit 1\r
   )\r
 )\r
 %HOST_PYTHON% build_ssl.py %1 %2 %3\r

diff --git a/PC/VS8.0/kill_python.c b/PC/VS8.0/kill_python.c
index 17a5f32ab26e3615141384d07df6ea7c45320a0a..6b916781cce5f833c6239cbf17a330554563f41c 100644 (file)
--- 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 1ba124fe993dc51f99bf2f82ea6a207658e896ff..5e4cde9c377dc0ef9ea71b18c28f649e8c703966 100644 (file)
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -38,7 +38,7 @@
        />\r
        <UserMacro\r
                Name="PyDllName"\r
-               Value="python31"\r
+               Value="python32"\r
        />\r
        <UserMacro\r
                Name="PythonExe"\r

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 3c3c6f49eb77e7b6ecff476d85038ecbd816965c..c90644f38bab57aad9e28ff904c7516374d55db9 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -325,9 +325,9 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
                        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 */

diff --git a/PCbuild/kill_python.c b/PCbuild/kill_python.c
index 17a5f32ab26e3615141384d07df6ea7c45320a0a..6b916781cce5f833c6239cbf17a330554563f41c 100644 (file)
--- a/PCbuild/kill_python.c
+++ b/PCbuild/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/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 59163e623670cceff8aff86d624ddbf852580d63..aa801a10d20b086f934944419bb99f667603726f 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -38,7 +38,7 @@
        />
        <UserMacro
                Name="PyDllName"
-               Value="python31"
+               Value="python32"
        />
        <UserMacro
                Name="PythonExe"

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 918a1d3832c454913f86973dce8038731311a2b5..1a5f3012b3a7d931fa36ad5c9020768612cb34bf 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -37,7 +37,7 @@ NOTE:
    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