From fa2c61a22279f286e6e3abee0581fe66eb812737 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 20 Feb 2011 10:41:31 +0000 Subject: More automated version replacement. --- PC/VC6/pythoncore.dsp | 4 +- PC/VC6/readme.txt | 4 +- PC/VS7.1/pythoncore.vcproj | 24 +- PC/VS7.1/readme.txt | 4 +- PC/VS8.0/build_ssl.bat | 4 +- PC/VS8.0/kill_python.c | 2 +- PC/VS8.0/pyproject.vsprops | 2 +- PC/example_nt/example.vcproj | 4 +- PC/os2emx/Makefile | 2 +- PC/os2emx/README.os2emx | 2 +- PC/os2emx/python27.def | 1314 ---------------------------------------- PC/os2emx/python33.def | 1314 ++++++++++++++++++++++++++++++++++++++++ PC/pyconfig.h | 4 +- PC/python3.def | 1374 +++++++++++++++++++++--------------------- PC/python3.mak | 12 +- PC/python32gen.py | 25 - PC/python32stub.def | 689 --------------------- PC/python33gen.py | 25 + PC/python33stub.def | 689 +++++++++++++++++++++ PCbuild/build_ssl.bat | 4 +- PCbuild/kill_python.c | 2 +- PCbuild/pyproject.vsprops | 2 +- PCbuild/readme.txt | 2 +- README | 16 +- 24 files changed, 2762 insertions(+), 2762 deletions(-) delete mode 100644 PC/os2emx/python27.def create mode 100644 PC/os2emx/python33.def delete mode 100644 PC/python32gen.py delete mode 100644 PC/python32stub.def create mode 100644 PC/python33gen.py create mode 100644 PC/python33stub.def diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index f8a2c81..60074ed 100644 --- a/PC/VC6/pythoncore.dsp +++ b/PC/VC6/pythoncore.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # 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:"./python32.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:"./python33.dll" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" @@ -82,7 +82,7 @@ BSC32=bscmake.exe # 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:"./python32_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:"./python33_d.dll" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index 4e8d237..a683527 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -12,7 +12,7 @@ and build the projects. The proper order to build subprojects: 1) pythoncore (this builds the main Python DLL and library files, - python32.{dll, lib} in Release mode) + python33.{dll, lib} in Release mode) 2) python (this builds the main Python executable, python.exe in Release mode) @@ -23,7 +23,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: python32_d.dll, python_d.exe, pyexpat_d.pyd, and so on. +their name: python33_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 88b0e01..30dc1f5 100644 --- a/PC/VS7.1/pythoncore.vcproj +++ b/PC/VS7.1/pythoncore.vcproj @@ -39,15 +39,15 @@ @@ -99,15 +99,15 @@ @@ -166,15 +166,15 @@ Name="VCLinkerTool" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python32.dll" + OutputFile="./python33.dll" LinkIncremental="1" SuppressStartupBanner="FALSE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python32.pdb" + ProgramDatabaseFile=".\./python33.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python32.lib" + ImportLibrary=".\./python33.lib" TargetMachine="0"/> @@ -233,15 +233,15 @@ Name="VCLinkerTool" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python32.dll" + OutputFile="./python33.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python32.pdb" + ProgramDatabaseFile=".\./python33.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python32.lib" + ImportLibrary=".\./python33.lib" TargetMachine="0"/> diff --git a/PC/VS7.1/readme.txt b/PC/VS7.1/readme.txt index 8fb069f..bfd8a70 100644 --- a/PC/VS7.1/readme.txt +++ b/PC/VS7.1/readme.txt @@ -12,7 +12,7 @@ the "Standard" toolbar"), and build the projects. The proper order to build subprojects: 1) pythoncore (this builds the main Python DLL and library files, - python26.{dll, lib} in Release mode) + python33.{dll, lib} in Release mode) NOTE: in previous releases, this subproject was named after the release number, e.g. python20. @@ -26,7 +26,7 @@ The proper order to build subprojects: test slave; see SUBPROJECTS below) When using the Debug setting, the output files have a _d added to -their name: python26_d.dll, python_d.exe, parser_d.pyd, and so on. +their name: python33_d.dll, python_d.exe, parser_d.pyd, and so on. SUBPROJECTS ----------- diff --git a/PC/VS8.0/build_ssl.bat b/PC/VS8.0/build_ssl.bat index 29a1d81..a5c9b87 100644 --- a/PC/VS8.0/build_ssl.bat +++ b/PC/VS8.0/build_ssl.bat @@ -2,10 +2,10 @@ if not defined HOST_PYTHON ( if %1 EQU Debug ( set HOST_PYTHON=python_d.exe - if not exist python32_d.dll exit 1 + if not exist python33_d.dll exit 1 ) ELSE ( set HOST_PYTHON=python.exe - if not exist python32.dll exit 1 + if not exist python33.dll exit 1 ) ) %HOST_PYTHON% build_ssl.py %1 %2 %3 diff --git a/PC/VS8.0/kill_python.c b/PC/VS8.0/kill_python.c index 6b91678..bb323d3 100644 --- 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. python32[_d].dll), + * and see if any of our DLLs are loaded (i.e. python33[_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 6494216..4a582f1 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -38,7 +38,7 @@ />