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

[christian.heimes]

Author: christian.heimes
Date: Wed Dec 3 19:35:13 2008
New Revision: 67508

Log:
More 3.0 -> 3.1 transistions

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/pyproject.vsprops
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 Wed Dec 3 19:35:13 2008
@@ -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:"./python30.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:"./python31.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:"./python30_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:"./python31_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 Wed Dec 3 19:35:13 2008
@@ -13,7 +13,7 @@
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 @@
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
-----------

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 Wed Dec 3 19:35:13 2008
@@ -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"/>

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 Wed Dec 3 19:35:13 2008
@@ -38,7 +38,7 @@
/>
<UserMacro
Name="PyDllName"
- Value="python30"
+ Value="python31"
/>
<UserMacro
Name="PythonExe"

Modified: python/branches/py3k/PCbuild/kill_python.c
==============================================================================
--- python/branches/py3k/PCbuild/kill_python.c (original)
+++ python/branches/py3k/PCbuild/kill_python.c Wed Dec 3 19:35:13 2008
@@ -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. 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.

Modified: python/branches/py3k/PCbuild/pyproject.vsprops
==============================================================================
--- python/branches/py3k/PCbuild/pyproject.vsprops (original)
+++ python/branches/py3k/PCbuild/pyproject.vsprops Wed Dec 3 19:35:13 2008
@@ -38,7 +38,7 @@
/>
<UserMacro
Name="PyDllName"
- Value="python30"
+ Value="python31"
/>
<UserMacro
Name="PythonExe"

Modified: python/branches/py3k/PCbuild/readme.txt
==============================================================================
--- python/branches/py3k/PCbuild/readme.txt (original)
+++ python/branches/py3k/PCbuild/readme.txt Wed Dec 3 19:35:13 2008
@@ -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: 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