More 3.0 -> 3.1 transistions

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 2b702ad8773c73cb0f43927bd4c38c2e49a8387b..732201af3a9569999e27d7e5740d012ade8b5cf0 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:"./python30.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:"./python31.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:"./python30_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:"./python31_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 fed79d6ca45c65fce86aa8144589355fb4b67ac3..f3d74ad53108bf53a5e0ea3bbfdb059ec641bab1 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,
-               python30.{dll, lib} in Release mode)
+               python31.{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:  python30_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
+their name:  python31_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 9d2e4caa181ec75554099f97155696d51c600e2b..1d977d3af78ed047a5e38a9d8d53aa5f19d6c9ae 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="./python30.dll"
+                               OutputFile="./python31.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
                                IgnoreDefaultLibraryNames="libc"
                                GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile=".\./python30.pdb"
+                               ProgramDatabaseFile=".\./python31.pdb"
                                SubSystem="2"
                                BaseAddress="0x1e000000"
-                               ImportLibrary=".\./python30.lib"
+                               ImportLibrary=".\./python31.lib"
                                TargetMachine="1"/>
                        <Tool
                                Name="VCMIDLTool"/>
@@ -99,15 +99,15 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="getbuildinfo.o"
-                               OutputFile="./python30_d.dll"
+                               OutputFile="./python31_d.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
                                IgnoreDefaultLibraryNames="libc"
                                GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile=".\./python30_d.pdb"
+                               ProgramDatabaseFile=".\./python31_d.pdb"
                                SubSystem="2"
                                BaseAddress="0x1e000000"
-                               ImportLibrary=".\./python30_d.lib"
+                               ImportLibrary=".\./python31_d.lib"
                                TargetMachine="1"/>
                        <Tool
                                Name="VCMIDLTool"/>
@@ -166,15 +166,15 @@
                                Name="VCLinkerTool"
                                AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
                                AdditionalDependencies="getbuildinfo.o"
-                               OutputFile="./python30.dll"
+                               OutputFile="./python31.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="FALSE"
                                IgnoreDefaultLibraryNames="libc"
                                GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile=".\./python30.pdb"
+                               ProgramDatabaseFile=".\./python31.pdb"
                                SubSystem="2"
                                BaseAddress="0x1e000000"
-                               ImportLibrary=".\./python30.lib"
+                               ImportLibrary=".\./python31.lib"
                                TargetMachine="0"/>
                        <Tool
                                Name="VCMIDLTool"/>
@@ -233,15 +233,15 @@
                                Name="VCLinkerTool"
                                AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
                                AdditionalDependencies="getbuildinfo.o"
-                               OutputFile="./python30.dll"
+                               OutputFile="./python31.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
                                IgnoreDefaultLibraryNames="libc"
                                GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile=".\./python30.pdb"
+                               ProgramDatabaseFile=".\./python31.pdb"
                                SubSystem="2"
                                BaseAddress="0x1e000000"
-                               ImportLibrary=".\./python30.lib"
+                               ImportLibrary=".\./python31.lib"
                                TargetMachine="0"/>
                        <Tool
                                Name="VCMIDLTool"/>

diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index ae8b113a6cc09966fd316175c589c89ba9768ead..24ecf438520057aae5439ae60e3a77eab999b01a 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="python30"\r
+               Value="python31"\r
        />\r
        <UserMacro\r
                Name="PythonExe"\r

diff --git a/PCbuild/kill_python.c b/PCbuild/kill_python.c
index f3880fc83e25110beb42c89b61a9328906b3b572..17a5f32ab26e3615141384d07df6ea7c45320a0a 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. python30[_d].dll),
+         * and see if any of our DLLs are loaded (i.e. python31[_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 f16cf00a5bbf7661349ea4b1ec4728cf9b55f1b6..703c2f4dc2d79dbcf045c04773894352df401041 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -38,7 +38,7 @@
        />
        <UserMacro
                Name="PyDllName"
-               Value="python30"
+               Value="python31"
        />
        <UserMacro
                Name="PythonExe"

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index b16daf152b5e6e02a13c77ff9a474482e5f96702..8e4ce8907d8b94035b131cd00c0cf0c67f84cc0b 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:  python30_d.dll, python_d.exe, parser_d.pyd, and so on. Both
+their name:  python31_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