Kaydet (Commit) 83a3f0c3 authored tarafından Tim Peters's avatar Tim Peters

Windows build: close out 2.2, prep for 2.3.

üst af8446f8
...@@ -333,9 +333,9 @@ typedef int pid_t; ...@@ -333,9 +333,9 @@ typedef int pid_t;
more (other compilers will still need to do so, but that's taken care more (other compilers will still need to do so, but that's taken care
of by the Distutils, so it's not a problem). */ of by the Distutils, so it's not a problem). */
#ifdef _DEBUG #ifdef _DEBUG
#pragma comment(lib,"python22_d.lib") #pragma comment(lib,"python23_d.lib")
#else #else
#pragma comment(lib,"python22.lib") #pragma comment(lib,"python23.lib")
#endif #endif
#endif /* USE_DL_EXPORT */ #endif /* USE_DL_EXPORT */
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* PYTHON_DLL_NAME ditto. * PYTHON_DLL_NAME ditto.
* MS_DLL_ID must match PY_VERSION in the Windows install script. * MS_DLL_ID must match PY_VERSION in the Windows install script.
*/ */
#define MS_DLL_ID "2.2" #define MS_DLL_ID "2.3"
#ifndef PYTHON_DLL_NAME #ifndef PYTHON_DLL_NAME
#define PYTHON_DLL_NAME "python22.dll" #define PYTHON_DLL_NAME "python22.dll"
...@@ -73,7 +73,7 @@ BEGIN ...@@ -73,7 +73,7 @@ BEGIN
VALUE "FileDescription", "Python Core\0" VALUE "FileDescription", "Python Core\0"
VALUE "FileVersion", PYTHON_VERSION VALUE "FileVersion", PYTHON_VERSION
VALUE "InternalName", "Python DLL\0" VALUE "InternalName", "Python DLL\0"
VALUE "LegalCopyright", "Copyright 2001 Python Software Foundation. Copyright 2000 BeOpen.com. Copyright 1995-2001 CNRI. Copyright 1991-1995 SMC.\0" VALUE "LegalCopyright", "Copyright 2001-2002 Python Software Foundation. Copyright 2000 BeOpen.com. Copyright 1995-2001 CNRI. Copyright 1991-1995 SMC.\0"
VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
VALUE "ProductName", "Python\0" VALUE "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION VALUE "ProductVersion", PYTHON_VERSION
......
...@@ -33,8 +33,10 @@ How to change the Windows build number: ...@@ -33,8 +33,10 @@ How to change the Windows build number:
Windows Python BUILD numbers Windows Python BUILD numbers
---------------------------- ----------------------------
29 CVS development
21-Dec-2001
28 2.2 final 28 2.2 final
21-Dec-2001 TENTATIVE 21-Dec-2001
27 2.2c1 27 2.2c1
14-Dec-2001 14-Dec-2001
26 2.2b2 26 2.2b2
......
Document Type: WSE Document Type: WSE
item: Global item: Global
Version=8.14 Version=8.14
Title=Python 2.2 Title=Python 2.3 alpha 1
Flags=00010100 Flags=00010100
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Japanese Font Name=MS Gothic Japanese Font Name=MS Gothic
...@@ -18,14 +18,14 @@ item: Global ...@@ -18,14 +18,14 @@ item: Global
Patch Flags=0000000000001001 Patch Flags=0000000000001001
Patch Threshold=85 Patch Threshold=85
Patch Memory=4000 Patch Memory=4000
EXE Filename=Python-2.2.exe EXE Filename=Python-2.3a1.exe
Dialogs Version=8 Dialogs Version=8
Version File=2.2 Version File=2.3a1
Version Description=Python Programming Language Version Description=Python Programming Language
Version Copyright=2001 Python Software Foundation Version Copyright=2001 Python Software Foundation
Version Company=PythonLabs at Zope Corporation Version Company=PythonLabs at Zope Corporation
Crystal Format=10111100101100000010001001001001 Crystal Format=10111100101100000010001001001001
Step View=&All Step View=&Properties
Variable Name1=_WISE_ Variable Name1=_WISE_
Variable Description1=WISE root directory Variable Description1=WISE root directory
Variable Default1=C:\PROGRAM FILES\WISE INSTALLMASTER 8.1 Variable Default1=C:\PROGRAM FILES\WISE INSTALLMASTER 8.1
...@@ -50,7 +50,7 @@ item: Global ...@@ -50,7 +50,7 @@ item: Global
Variable Flags5=00001000 Variable Flags5=00001000
Variable Name6=_PYMINOR_ Variable Name6=_PYMINOR_
Variable Description6=Python minor version number; the 3 in 2.3 Variable Description6=Python minor version number; the 3 in 2.3
Variable Default6=2 Variable Default6=3
Variable Flags6=00001000 Variable Flags6=00001000
Variable Name7=_DOADMIN_ Variable Name7=_DOADMIN_
Variable Description7=The initial value for %DOADMIN%. Variable Description7=The initial value for %DOADMIN%.
...@@ -64,7 +64,7 @@ item: Global ...@@ -64,7 +64,7 @@ item: Global
end end
item: Set Variable item: Set Variable
Variable=PYVER_STRING Variable=PYVER_STRING
Value=2.2 Value=2.3a1
end end
item: Remark item: Remark
end end
......
...@@ -57,7 +57,7 @@ BSC32=bscmake.exe ...@@ -57,7 +57,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:"./python22.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:"./python23.dll"
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
...@@ -88,7 +88,7 @@ BSC32=bscmake.exe ...@@ -88,7 +88,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:"./python22_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:"./python23_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug"
...@@ -118,9 +118,9 @@ BSC32=bscmake.exe ...@@ -118,9 +118,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 wsock32.lib largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python22_d.dll" /pdbtype:sept # ADD BASE LINK32 wsock32.lib largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python23_d.dll" /pdbtype:sept
# SUBTRACT BASE LINK32 /pdb:none # SUBTRACT BASE LINK32 /pdb:none
# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python22_d.dll" /pdbtype:sept # ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python23_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Release" !ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Release"
...@@ -739,11 +739,11 @@ SOURCE=..\Modules\getbuildinfo.c ...@@ -739,11 +739,11 @@ SOURCE=..\Modules\getbuildinfo.c
!IF "$(CFG)" == "pythoncore - Win32 Release" !IF "$(CFG)" == "pythoncore - Win32 Release"
# ADD CPP /D BUILD=28 # ADD CPP /D BUILD=29
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
# ADD CPP /D BUILD=28 # ADD CPP /D BUILD=29
!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment