[Python-checkins] cpython (3.2): Upgrade bzip2 to 1.0.6.
martin.v.loewis
python-checkins at python.org
Mon May 14 14:17:42 CEST 2012
http://hg.python.org/cpython/rev/db97a8248863
changeset: 76921:db97a8248863
branch: 3.2
parent: 76916:b50d4ae6aaa3
user: Martin v. Löwis <martin at v.loewis.de>
date: Mon May 14 14:13:48 2012 +0200
summary:
Upgrade bzip2 to 1.0.6.
files:
PC/VC6/bz2.dsp | 8 ++++----
PC/VC6/readme.txt | 6 +++---
PC/VS8.0/bz2.vcproj | 4 ++--
PC/VS8.0/pyproject.vsprops | 2 +-
PCbuild/bz2.vcproj | 4 ++--
PCbuild/pyproject.vsprops | 2 +-
PCbuild/readme.txt | 10 +++++-----
Tools/buildbot/external-common.bat | 8 ++++----
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/PC/VC6/bz2.dsp b/PC/VC6/bz2.dsp
--- a/PC/VC6/bz2.dsp
+++ b/PC/VC6/bz2.dsp
@@ -44,7 +44,7 @@
# PROP Target_Dir ""
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 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 MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
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 ..\..\..\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
!ELSEIF "$(CFG)" == "bz2 - Win32 Debug"
@@ -72,7 +72,7 @@
# PROP Target_Dir ""
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 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 MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
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 ..\..\..\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
!ENDIF
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -120,14 +120,14 @@
Download the source from the python.org copy into the dist
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.
- cd dist\bzip2-1.0.5
+ cd dist\bzip2-1.0.6
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.
diff --git a/PC/VS8.0/bz2.vcproj b/PC/VS8.0/bz2.vcproj
--- a/PC/VS8.0/bz2.vcproj
+++ b/PC/VS8.0/bz2.vcproj
@@ -532,7 +532,7 @@
</File>
</Filter>
<Filter
- Name="bzip2 1.0.5 Header Files"
+ Name="bzip2 1.0.6 Header Files"
>
<File
RelativePath="$(bz2Dir)\bzlib.h"
@@ -544,7 +544,7 @@
</File>
</Filter>
<Filter
- Name="bzip2 1.0.5 Source Files"
+ Name="bzip2 1.0.6 Source Files"
>
<File
RelativePath="$(bz2Dir)\blocksort.c"
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -54,7 +54,7 @@
/>
<UserMacro
Name="bz2Dir"
- Value="$(externalsDir)\bzip2-1.0.5"
+ Value="$(externalsDir)\bzip2-1.0.6"
/>
<UserMacro
Name="opensslDir"
diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj
--- a/PCbuild/bz2.vcproj
+++ b/PCbuild/bz2.vcproj
@@ -532,7 +532,7 @@
</File>
</Filter>
<Filter
- Name="bzip2 1.0.5 Header Files"
+ Name="bzip2 1.0.6 Header Files"
>
<File
RelativePath="$(bz2Dir)\bzlib.h"
@@ -544,7 +544,7 @@
</File>
</Filter>
<Filter
- Name="bzip2 1.0.5 Source Files"
+ Name="bzip2 1.0.6 Source Files"
>
<File
RelativePath="$(bz2Dir)\blocksort.c"
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -54,7 +54,7 @@
/>
<UserMacro
Name="bz2Dir"
- Value="$(externalsDir)\bzip2-1.0.5"
+ Value="$(externalsDir)\bzip2-1.0.6"
/>
<UserMacro
Name="opensslDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -118,21 +118,21 @@
Download the source from the python.org copy into the dist
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
obtaining external sources then you don't need to manually get the source
above via subversion. **
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\.
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
- you need to clean up bzip2-1.0.5\ by hand.
+ 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.6\ by hand.
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
Python wrapper for the secure sockets library.
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -4,7 +4,7 @@
cd ..
@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.
- at rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5
+ at 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 tcltk64 rd /s/q tcltk64
@rem if exist tcl8.4.12 rd /s/q tcl8.4.12
@@ -18,9 +18,9 @@
@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4
@rem bzip
-if not exist bzip2-1.0.5 (
- rd /s/q bzip2-1.0.3
- svn export http://svn.python.org/projects/external/bzip2-1.0.5
+if not exist bzip2-1.0.6 (
+ rd /s/q bzip2-1.0.5
+ svn export http://svn.python.org/projects/external/bzip2-1.0.6
)
@rem Sleepycat db
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list