mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-18 01:57:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Upgrade to bzip2 1.0.6.

Browse source
This commit is contained in:
Martin v. Löwis 2012-05-14 14:19:09 +02:00
parent ace9261558
commit e7f67b5b98
8 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PC/VC6/bz2.dsp
View file

@ -44,7 +44,7 @@ RSC=rc.exe
# PROP Target_Dir "" # PROP Target_Dir ""
F90=df.exe F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "Py_BUILD_CORE_MODULE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "Py_BUILD_CORE_MODULE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.5" /D "Py_BUILD_CORE_MODULE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.6" /D "Py_BUILD_CORE_MODULE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -54,7 +54,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 ..\..\..\bzip2-1.0.5\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./bz2.pyd" # ADD LINK32 ..\..\..\bzip2-1.0.6\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./bz2.pyd"
# SUBTRACT LINK32 /pdb:none /nodefaultlib # SUBTRACT LINK32 /pdb:none /nodefaultlib
!ELSEIF "$(CFG)" == "bz2 - Win32 Debug" !ELSEIF "$(CFG)" == "bz2 - Win32 Debug"
@ -72,7 +72,7 @@ LINK32=link.exe
# PROP Target_Dir "" # PROP Target_Dir ""
F90=df.exe F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "Py_BUILD_CORE_MODULE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "Py_BUILD_CORE_MODULE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.5" /D "Py_BUILD_CORE_MODULE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\bzip2-1.0.6" /D "Py_BUILD_CORE_MODULE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -82,7 +82,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 ..\..\..\bzip2-1.0.5\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"libc" /out:"./bz2_d.pyd" /pdbtype:sept # ADD LINK32 ..\..\..\bzip2-1.0.6\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"libc" /out:"./bz2_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ENDIF !ENDIF

6
PC/VC6/readme.txt
View file

@ -120,14 +120,14 @@ bz2
Download the source from the python.org copy into the dist Download the source from the python.org copy into the dist
directory: directory:
svn export http://svn.python.org/projects/external/bzip2-1.0.5 svn export http://svn.python.org/projects/external/bzip2-1.0.6
And requires building bz2 first. And requires building bz2 first.
cd dist\bzip2-1.0.5 cd dist\bzip2-1.0.6
nmake -f makefile.msc nmake -f makefile.msc
All of this managed to build bzip2-1.0.5\libbz2.lib, which the Python All of this managed to build bzip2-1.0.6\libbz2.lib, which the Python
project links in. project links in.

4
PC/VS8.0/bz2.vcproj
View file

@ -532,7 +532,7 @@
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="bzip2 1.0.5 Header Files" Name="bzip2 1.0.6 Header Files"
> >
<File <File
RelativePath="$(bz2Dir)\bzlib.h" RelativePath="$(bz2Dir)\bzlib.h"
@ -544,7 +544,7 @@
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="bzip2 1.0.5 Source Files" Name="bzip2 1.0.6 Source Files"
> >
<File <File
RelativePath="$(bz2Dir)\blocksort.c" RelativePath="$(bz2Dir)\blocksort.c"

2
PC/VS8.0/pyproject.vsprops
View file

@ -78,7 +78,7 @@
/> />
<UserMacro <UserMacro
Name="bz2Dir" Name="bz2Dir"
Value="$(externalsDir)\bzip2-1.0.5" Value="$(externalsDir)\bzip2-1.0.6"
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"

4
PCbuild/bz2.vcproj
View file

@ -532,7 +532,7 @@
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="bzip2 1.0.5 Header Files" Name="bzip2 1.0.6 Header Files"
> >
<File <File
RelativePath="$(bz2Dir)\bzlib.h" RelativePath="$(bz2Dir)\bzlib.h"
@ -544,7 +544,7 @@
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="bzip2 1.0.5 Source Files" Name="bzip2 1.0.6 Source Files"
> >
<File <File
RelativePath="$(bz2Dir)\blocksort.c" RelativePath="$(bz2Dir)\blocksort.c"

2
PCbuild/pyproject.vsprops
View file

@ -78,7 +78,7 @@
/> />
<UserMacro <UserMacro
Name="bz2Dir" Name="bz2Dir"
Value="$(externalsDir)\bzip2-1.0.5" Value="$(externalsDir)\bzip2-1.0.6"
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"

10
PCbuild/readme.txt
View file

@ -121,21 +121,21 @@ bz2
Download the source from the python.org copy into the dist Download the source from the python.org copy into the dist
directory: directory:
svn export http://svn.python.org/projects/external/bzip2-1.0.5 svn export http://svn.python.org/projects/external/bzip2-1.0.6
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source obtaining external sources then you don't need to manually get the source
above via subversion. ** above via subversion. **
A custom pre-link step in the bz2 project settings should manage to A custom pre-link step in the bz2 project settings should manage to
build bzip2-1.0.5\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is build bzip2-1.0.6\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
linked in PCbuild\. linked in PCbuild\.
However, the bz2 project is not smart enough to remove anything under However, the bz2 project is not smart enough to remove anything under
bzip2-1.0.5\ when you do a clean, so if you want to rebuild bzip2.lib bzip2-1.0.6\ when you do a clean, so if you want to rebuild bzip2.lib
you need to clean up bzip2-1.0.5\ by hand. you need to clean up bzip2-1.0.6\ by hand.
All of this managed to build libbz2.lib in All of this managed to build libbz2.lib in
bzip2-1.0.5\$platform-$configuration\, which the Python project links in. bzip2-1.0.6\$platform-$configuration\, which the Python project links in.
_ssl _ssl
Python wrapper for the secure sockets library. Python wrapper for the secure sockets library.

8
Tools/buildbot/external-common.bat
View file

@ -4,7 +4,7 @@
cd .. cd ..
@rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment @rem XXX: If you need to force the buildbots to start from a fresh environment, uncomment
@rem the following, check it in, then check it out, comment it out, then check it back in. @rem the following, check it in, then check it out, comment it out, then check it back in.
@rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5 @rem if exist bzip2-1.0.6 rd /s/q bzip2-1.0.6
@rem if exist tcltk rd /s/q tcltk @rem if exist tcltk rd /s/q tcltk
@rem if exist tcltk64 rd /s/q tcltk64 @rem if exist tcltk64 rd /s/q tcltk64
@rem if exist tcl8.4.12 rd /s/q tcl8.4.12 @rem if exist tcl8.4.12 rd /s/q tcl8.4.12
@ -19,9 +19,9 @@ cd ..
@rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
@rem bzip @rem bzip
if not exist bzip2-1.0.5 ( if not exist bzip2-1.0.6 (
rd /s/q bzip2-1.0.3 rd /s/q bzip2-1.0.5
svn export http://svn.python.org/projects/external/bzip2-1.0.5 svn export http://svn.python.org/projects/external/bzip2-1.0.6
) )
@rem Berkeley DB @rem Berkeley DB