mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

More 3.0 -> 3.1 transistions

Browse source
This commit is contained in:
Christian Heimes 2008-12-03 18:35:13 +00:00
parent 70e5cabfdc
commit fd44062a7f
7 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PC/VC6/pythoncore.dsp
View file

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
@ -82,7 +82,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # SUBTRACT LINK32 /pdb:none
!ENDIF !ENDIF

4
PC/VC6/readme.txt
View file

@ -13,7 +13,7 @@ and build the projects.
The proper order to build subprojects: The proper order to build subprojects:
1) pythoncore (this builds the main Python DLL and library files, 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, 2) python (this builds the main Python executable,
python.exe in Release mode) python.exe in Release mode)
@ -24,7 +24,7 @@ The proper order to build subprojects:
to the subsystems they implement; see SUBPROJECTS below) to the subsystems they implement; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to 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 SUBPROJECTS
----------- -----------

24
PC/VS7.1/pythoncore.vcproj
View file

@ -39,15 +39,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o" AdditionalDependencies="getbuildinfo.o"
OutputFile="./python30.dll" OutputFile="./python31.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python30.pdb" ProgramDatabaseFile=".\./python31.pdb"
SubSystem="2" SubSystem="2"
BaseAddress="0x1e000000" BaseAddress="0x1e000000"
ImportLibrary=".\./python30.lib" ImportLibrary=".\./python31.lib"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -99,15 +99,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="getbuildinfo.o" AdditionalDependencies="getbuildinfo.o"
OutputFile="./python30_d.dll" OutputFile="./python31_d.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python30_d.pdb" ProgramDatabaseFile=".\./python31_d.pdb"
SubSystem="2" SubSystem="2"
BaseAddress="0x1e000000" BaseAddress="0x1e000000"
ImportLibrary=".\./python30_d.lib" ImportLibrary=".\./python31_d.lib"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -166,15 +166,15 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o" AdditionalDependencies="getbuildinfo.o"
OutputFile="./python30.dll" OutputFile="./python31.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="FALSE" SuppressStartupBanner="FALSE"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python30.pdb" ProgramDatabaseFile=".\./python31.pdb"
SubSystem="2" SubSystem="2"
BaseAddress="0x1e000000" BaseAddress="0x1e000000"
ImportLibrary=".\./python30.lib" ImportLibrary=".\./python31.lib"
TargetMachine="0"/> TargetMachine="0"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
@ -233,15 +233,15 @@
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="getbuildinfo.o" AdditionalDependencies="getbuildinfo.o"
OutputFile="./python30.dll" OutputFile="./python31.dll"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc" IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./python30.pdb" ProgramDatabaseFile=".\./python31.pdb"
SubSystem="2" SubSystem="2"
BaseAddress="0x1e000000" BaseAddress="0x1e000000"
ImportLibrary=".\./python30.lib" ImportLibrary=".\./python31.lib"
TargetMachine="0"/> TargetMachine="0"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>

2
PC/VS8.0/pyproject.vsprops
View file

@ -38,7 +38,7 @@
/> />
<UserMacro <UserMacro
Name="PyDllName" Name="PyDllName"
Value="python30" Value="python31"
/> />
<UserMacro <UserMacro
Name="PythonExe" Name="PythonExe"

2
PCbuild/kill_python.c
View file

@ -106,7 +106,7 @@ main(int argc, char **argv)
/* /*
* XXX TODO: if we really wanted to be fancy, we could check the * XXX TODO: if we really wanted to be fancy, we could check the
* modules for all processes (not just the python[_d].exe ones) * 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. * as that would also inhibit our ability to rebuild the solution.
* Not worth loosing sleep over though; for now, a simple check * Not worth loosing sleep over though; for now, a simple check
* for just the python executable should be sufficient. * for just the python executable should be sufficient.

2
PCbuild/pyproject.vsprops
View file

@ -38,7 +38,7 @@
/> />
<UserMacro <UserMacro
Name="PyDllName" Name="PyDllName"
Value="python30" Value="python31"
/> />
<UserMacro <UserMacro
Name="PythonExe" Name="PythonExe"

2
PCbuild/readme.txt
View file

@ -37,7 +37,7 @@ NOTE:
running a Python core buildbot test slave; see SUBPROJECTS below) running a Python core buildbot test slave; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to 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 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 The 32bit builds end up in the solution folder PCbuild while the x64 builds