]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e768b06)
Upgrade bzip2 to 1.0.6.
authorMartin v. Löwis <martin@v.loewis.de>
Mon, 14 May 2012 12:13:48 +0000 (14:13 +0200)
committerMartin v. Löwis <martin@v.loewis.de>
Mon, 14 May 2012 12:13:48 +0000 (14:13 +0200)
PC/VC6/bz2.dsp patch | blob | history
PC/VC6/readme.txt patch | blob | history
PC/VS8.0/bz2.vcproj patch | blob | history
PC/VS8.0/pyproject.vsprops patch | blob | history
PCbuild/bz2.vcproj patch | blob | history
PCbuild/pyproject.vsprops patch | blob | history
PCbuild/readme.txt patch | blob | history
Tools/buildbot/external-common.bat patch | blob | history

diff --git a/PC/VC6/bz2.dsp b/PC/VC6/bz2.dsp
index 3c164fa957d3c0dff1a0d05700fab50d21fbc155..352cbad59d054dcf0a0e91fb03fdd6fec0caaf48 100644 (file)
--- a/PC/VC6/bz2.dsp
+++ b/PC/VC6/bz2.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""\r
 F90=df.exe\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "Py_BUILD_CORE_MODULE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# ADD LINK32 ..\..\..\bzip2-1.0.5\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./bz2.pyd"\r
+# ADD LINK32 ..\..\..\bzip2-1.0.6\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./bz2.pyd"\r
 # SUBTRACT LINK32 /pdb:none /nodefaultlib\r
 \r
 !ELSEIF  "$(CFG)" == "bz2 - Win32 Debug"\r
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""\r
 F90=df.exe\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "Py_BUILD_CORE_MODULE" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# 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\r
+# 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\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# 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\r
+# 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\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index 4e8d237b7a2608d332c424c8d8c5fe8167e66170..7e85c96fe5156fe17b9907ebf6915bffb072a911 100644 (file)
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -120,14 +120,14 @@ bz2
     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
index a97d1d5d6cc641a0f89e7d482a60c4ff3d4aab4c..1f119793214092bf845fa49d83318b96724203b3 100644 (file)
--- a/PC/VS8.0/bz2.vcproj
+++ b/PC/VS8.0/bz2.vcproj
@@ -532,7 +532,7 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="bzip2 1.0.5 Header Files"\r
+                       Name="bzip2 1.0.6 Header Files"\r
                        >\r
                        <File\r
                                RelativePath="$(bz2Dir)\bzlib.h"\r
@@ -544,7 +544,7 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="bzip2 1.0.5 Source Files"\r
+                       Name="bzip2 1.0.6 Source Files"\r
                        >\r
                        <File\r
                                RelativePath="$(bz2Dir)\blocksort.c"\r
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index 64942160e26685d2d2c7d39aa561a2806cb4f106..763f6878d87190684daf1ca66fce6dee99df0963 100644 (file)
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -54,7 +54,7 @@
        />\r
        <UserMacro\r
                Name="bz2Dir"\r
-               Value="$(externalsDir)\bzip2-1.0.5"\r
+               Value="$(externalsDir)\bzip2-1.0.6"\r
        />\r
        <UserMacro\r
                Name="opensslDir"\r
diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj
index 035736e286e8badfbe250994632edb9a1c104911..e2b353bc8cefe9334fafc3766aafb84b5151f0be 100644 (file)
--- a/PCbuild/bz2.vcproj
+++ b/PCbuild/bz2.vcproj
@@ -532,7 +532,7 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="bzip2 1.0.5 Header Files"\r
+                       Name="bzip2 1.0.6 Header Files"\r
                        >\r
                        <File\r
                                RelativePath="$(bz2Dir)\bzlib.h"\r
@@ -544,7 +544,7 @@
                        </File>\r
                </Filter>\r
                <Filter\r
-                       Name="bzip2 1.0.5 Source Files"\r
+                       Name="bzip2 1.0.6 Source Files"\r
                        >\r
                        <File\r
                                RelativePath="$(bz2Dir)\blocksort.c"\r
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 3f69a426f76a9eba48c7cb33662f3724c043ba39..881befda5dec40b8f2e98c6e4b97c26fce685a96 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -54,7 +54,7 @@
        />\r
        <UserMacro\r
                Name="bz2Dir"\r
-               Value="$(externalsDir)\bzip2-1.0.5"\r
+               Value="$(externalsDir)\bzip2-1.0.6"\r
        />\r
        <UserMacro\r
                Name="opensslDir"\r
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index dbe031f4749ce2e6e81908ba4a97920a2767b27b..3bb64929727f1cb033cec4ef8b53553a520dc6f0 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -118,21 +118,21 @@ bz2
     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
index 1ff282e21ec42ebdcbc9eeeb6d2ad986583418e2..2b86c6816d5b5e5960d157b0e4bb80c4ba42ff0e 100644 (file)
--- 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.
-@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 tcltk64 rd /s/q tcltk64
 @rem if exist tcl8.4.12 rd /s/q tcl8.4.12
@@ -18,9 +18,9 @@ cd ..
 @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
Unnamed repository; edit this file 'description' to name the repository.