[Python-checkins] CVS: python/dist/src/PCbuild BUILDno.txt,1.11,1.12 python20.wse,1.39,1.40 pythoncore.dsp,1.13,1.14
Tim Peters
tim_one@users.sourceforge.net
2001年4月18日 14:12:27 -0700
Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv2242/python/dist/src/PCbuild
Modified Files:
BUILDno.txt python20.wse pythoncore.dsp
Log Message:
Move Windows stuff to 2.2, so CVS builds won't interfere with 2.1
installations.
Index: BUILDno.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/BUILDno.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** BUILDno.txt 2001年04月16日 18:20:30 1.11
--- BUILDno.txt 2001年04月18日 21:12:25 1.12
***************
*** 34,38 ****
Windows Python BUILD numbers
----------------------------
! 15 2.1
16-Apr-2001
14 2.1c2
--- 34,40 ----
Windows Python BUILD numbers
----------------------------
! 16 CVS development
! 18-Apr-2001
! 15 2.1 final
16-Apr-2001
14 2.1c2
Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** python20.wse 2001年04月16日 18:20:30 1.39
--- python20.wse 2001年04月18日 21:12:25 1.40
***************
*** 2,6 ****
item: Global
Version=5.0
! Title=Python 2.1
Flags=00010100
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--- 2,6 ----
item: Global
Version=5.0
! Title=Python 2.2 pre-alpha
Flags=00010100
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
***************
*** 67,75 ****
item: Set Variable
Variable=APPTITLE
! Value=Python 2.1
end
item: Set Variable
Variable=GROUP
! Value=Python 2.1
end
item: Remark
--- 67,75 ----
item: Set Variable
Variable=APPTITLE
! Value=Python 2.2 pre-alpha
end
item: Set Variable
Variable=GROUP
! Value=Python 2.2
end
item: Remark
***************
*** 78,86 ****
item: Set Variable
Variable=PY_VERSION
! Value=2.1
end
item: Set Variable
Variable=MAINDIR
! Value=Python21
end
item: Get Registry Key Value
--- 78,86 ----
item: Set Variable
Variable=PY_VERSION
! Value=2.2
end
item: Set Variable
Variable=MAINDIR
! Value=Python22
end
item: Get Registry Key Value
***************
*** 829,834 ****
end
item: Install File
! Source=%_SRC_%\PCbuild\python21.lib
! Destination=%MAINDIR%\libs\python21.lib
Flags=0000000000000010
end
--- 829,834 ----
end
item: Install File
! Source=%_SRC_%\PCbuild\python22.lib
! Destination=%MAINDIR%\libs\python22.lib
Flags=0000000000000010
end
***************
*** 852,857 ****
end
item: Install File
! Source=%_SRC_%\pcbuild\python21.dll
! Destination=%DLLDEST%\python21.dll
Flags=0000000000000010
end
--- 852,857 ----
end
item: Install File
! Source=%_SRC_%\pcbuild\python22.dll
! Destination=%DLLDEST%\python22.dll
Flags=0000000000000010
end
Index: pythoncore.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.dsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** pythoncore.dsp 2001年04月16日 18:20:30 1.13
--- pythoncore.dsp 2001年04月18日 21:12:25 1.14
***************
*** 58,62 ****
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:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python21.dll"
# SUBTRACT LINK32 /pdb:none
--- 58,62 ----
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:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python22.dll"
# SUBTRACT LINK32 /pdb:none
***************
*** 89,93 ****
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:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python21_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
--- 89,93 ----
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:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python22_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
***************
*** 119,125 ****
# ADD BSC32 /nologo
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
# 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
# SUBTRACT LINK32 /pdb:none
--- 119,125 ----
# ADD BSC32 /nologo
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
# 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
# SUBTRACT LINK32 /pdb:none
***************
*** 740,748 ****
!IF "$(CFG)" == "pythoncore - Win32 Release"
! # ADD CPP /D BUILD=15
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
! # ADD CPP /D BUILD=15
!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug"
--- 740,748 ----
!IF "$(CFG)" == "pythoncore - Win32 Release"
! # ADD CPP /D BUILD=16
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
! # ADD CPP /D BUILD=16
!ELSEIF "$(CFG)" == "pythoncore - Win32 Alpha Debug"