Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Move Windows stuff to 2.2, so CVS builds won't interfere with 2.1 

installations.
This commit is contained in:
Tim Peters 2001-04-18 21:12:25 +00:00
parent bc524c4e9f
commit 52709e321c
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PC/config.h
View File

@ -327,9 +327,9 @@ typedef unsigned long uintptr_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,"python21_d.lib") #pragma comment(lib,"python22_d.lib")
#else #else
#pragma comment(lib,"python21.lib") #pragma comment(lib,"python22.lib")
#endif #endif
#endif /* USE_DL_EXPORT */ #endif /* USE_DL_EXPORT */

4
PC/python_nt.rc
View File

@ -13,10 +13,10 @@
* 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.1" #define MS_DLL_ID "2.2"
#ifndef PYTHON_DLL_NAME #ifndef PYTHON_DLL_NAME
#define PYTHON_DLL_NAME "python21.dll" #define PYTHON_DLL_NAME "python22.dll"
#endif #endif
/* Nothing below this should need to be changed except for copyright /* Nothing below this should need to be changed except for copyright

4
PCbuild/BUILDno.txt
View File

@ -33,7 +33,9 @@ How to change the Windows build number:
Windows Python BUILD numbers Windows Python BUILD numbers
---------------------------- ----------------------------
15 2.1 16 CVS development
18-Apr-2001
15 2.1 final
16-Apr-2001 16-Apr-2001
14 2.1c2 14 2.1c2
15-Apr-2001 15-Apr-2001

18
PCbuild/python20.wse
View File

@ -1,7 +1,7 @@
Document Type: WSE Document Type: WSE
item: Global item: Global
Version=5.0 Version=5.0
Title=Python 2.1 Title=Python 2.2 pre-alpha
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
@ -66,22 +66,22 @@ item: End Block
end end
item: Set Variable item: Set Variable
Variable=APPTITLE Variable=APPTITLE
Value=Python 2.1 Value=Python 2.2 pre-alpha
end end
item: Set Variable item: Set Variable
Variable=GROUP Variable=GROUP
Value=Python 2.1 Value=Python 2.2
end end
item: Remark item: Remark
Text=PY_VERSION should be major.minor only; used to create the registry key; must match MS_DLL_ID in python_nt.rc Text=PY_VERSION should be major.minor only; used to create the registry key; must match MS_DLL_ID in python_nt.rc
end end
item: Set Variable item: Set Variable
Variable=PY_VERSION Variable=PY_VERSION
Value=2.1 Value=2.2
end end
item: Set Variable item: Set Variable
Variable=MAINDIR Variable=MAINDIR
Value=Python21 Value=Python22
end end
item: Get Registry Key Value item: Get Registry Key Value
Variable=PROGRAM_FILES Variable=PROGRAM_FILES
@ -828,8 +828,8 @@ item: Install File
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File item: Install File
Source=%_SRC_%\PCbuild\python21.lib Source=%_SRC_%\PCbuild\python22.lib
Destination=%MAINDIR%\libs\python21.lib Destination=%MAINDIR%\libs\python22.lib
Flags=0000000000000010 Flags=0000000000000010
end end
item: Remark item: Remark
@ -851,8 +851,8 @@ item: Remark
Text=*** Main Python DLL *** Text=*** Main Python DLL ***
end end
item: Install File item: Install File
Source=%_SRC_%\pcbuild\python21.dll Source=%_SRC_%\pcbuild\python22.dll
Destination=%DLLDEST%\python21.dll Destination=%DLLDEST%\python22.dll
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File item: Install File

12
PCbuild/pythoncore.dsp
View File

@ -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:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python21.dll" # ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python22.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
# 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:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python21_d.dll" /pdbtype:sept # ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python22_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
# 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:"./python21_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:"./python22_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:"./python21_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:"./python22_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
!IF "$(CFG)" == "pythoncore - Win32 Release" !IF "$(CFG)" == "pythoncore - Win32 Release"
# ADD CPP /D BUILD=15 # ADD CPP /D BUILD=16
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
# ADD CPP /D BUILD=15 # ADD CPP /D BUILD=16
!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug" !ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug"