[Python-checkins] CVS: python/dist/src/PCbuild readme.txt,1.22,1.23 zlib.dsp,1.15,1.16
Tim Peters
tim_one@users.sourceforge.net
Wed, 13 Mar 2002 13:51:58 -0800
Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv29528/python/dist/src/PCbuild
Modified Files:
readme.txt zlib.dsp
Log Message:
Move to zlib 1.1.4 on Windows (the new version that squashes the "double
free" glitch).
Bugfix candidate -- I'll backpatch this into 2.2.1 later this week.
Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** readme.txt 13 Feb 2002 23:56:46 -0000 1.22
--- readme.txt 13 Mar 2002 21:51:55 -0000 1.23
***************
*** 78,92 ****
zlib
- NOTE: This procedure is new (& simpler, & safer) for 2.1a2.
Python wrapper for the zlib compression library. Get the source code
! for version 1.1.3 from a convenient mirror at:
! http://www.info-zip.org/pub/infozip/zlib/
! Unpack into dist\zlib-1.1.3.
A custom pre-link step in the zlib project settings should manage to
! build zlib-1.1.3\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
linked in PCbuild\.
However, the zlib project is not smart enough to remove anything under
! zlib-1.1.3\ when you do a clean, so if you want to rebuild zlib.lib
! you need to clean up zlib-1.1.3\ by hand.
bsddb
--- 78,91 ----
zlib
Python wrapper for the zlib compression library. Get the source code
! for version 1.1.4 from a convenient mirror at:
! http://www.gzip.org/zlib/
! Unpack into dist\zlib-1.1.4.
A custom pre-link step in the zlib project settings should manage to
! build zlib-1.1.4\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
linked in PCbuild\.
However, the zlib project is not smart enough to remove anything under
! zlib-1.1.4\ when you do a clean, so if you want to rebuild zlib.lib
! you need to clean up zlib-1.1.4\ by hand.
bsddb
Index: zlib.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/zlib.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** zlib.dsp 31 Jan 2001 10:28:03 -0000 1.15
--- zlib.dsp 13 Mar 2002 21:51:55 -0000 1.16
***************
*** 45,49 ****
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.3" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 45,49 ----
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 55,64 ****
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 ..\..\zlib-1.1.3\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /export:initzlib
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking static zlib has been built
! PreLink_Cmds=cd ..\..\zlib-1.1.3 nmake -nologo -f msdos\makefile.w32 zlib.lib
# End Special Build Tool
--- 55,64 ----
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 ..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /export:initzlib
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking static zlib has been built
! PreLink_Cmds=cd ..\..\zlib-1.1.4 nmake -nologo -f msdos\makefile.w32 zlib.lib
# End Special Build Tool
***************
*** 78,82 ****
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.3" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
--- 78,82 ----
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /I "..\..\zlib-1.1.4" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 88,97 ****
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 ..\..\zlib-1.1.3\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib_d.pyd" /pdbtype:sept /export:initzlib
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking static zlib has been built
! PreLink_Cmds=cd ..\..\zlib-1.1.3 nmake -nologo -f msdos\makefile.w32 zlib.lib
# End Special Build Tool
--- 88,97 ----
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 ..\..\zlib-1.1.4\zlib.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib_d.pyd" /pdbtype:sept /export:initzlib
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking static zlib has been built
! PreLink_Cmds=cd ..\..\zlib-1.1.4 nmake -nologo -f msdos\makefile.w32 zlib.lib
# End Special Build Tool