From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 13 Jun 2008 17:28:35 +0000 (+0000)
Subject: Merged revisions 64239 via svnmerge from
X-Git-Tag: v3.0b1~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70ce8aae98e844feaf6a8db1b7f40ed507a0cd41;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 64239 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64239 | martin.v.loewis | 2008-06-13 19:22:39 +0200 (Fr, 13 Jun 2008) | 1 line

  Switch to bzip2 1.0.5.
........
---

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 3633aeb4fd44..eb6ab328f221 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -78,7 +78,7 @@
 	/>
 	<UserMacro
 		Name="bz2Dir"
-		Value="$(externalsDir)\bzip2-1.0.3"
+		Value="$(externalsDir)\bzip2-1.0.5"
 	/>
 	<UserMacro
 		Name="opensslDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index a55c1f1079fb..f56828d91198 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -121,21 +121,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.3
+    svn export http://svn.python.org/projects/external/bzip2-1.0.5
 
     ** 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.3\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
+    build bzip2-1.0.5\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.3\ when you do a clean, so if you want to rebuild bzip2.lib
-    you need to clean up bzip2-1.0.3\ by hand.
+    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.
 
     All of this managed to build libbz2.lib in 
-    bzip2-1.0.3\$platform-$configuration\, which the Python project links in.
+    bzip2-1.0.5\$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 d14ff520d114..236245d75a92 100644
--- 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.3 rd /s/q bzip2-1.0.3
+@rem if exist bzip2-1.0.5 rd /s/q bzip2-1.0.5
 @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,7 +18,10 @@ cd ..
 @rem if exist sqlite-source-3.3.4 rd /s/q sqlite-source-3.3.4    
 
 @rem bzip
-if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3
+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
+)
 
 @rem Sleepycat db
 if not exist db-4.4.20 svn export http://svn.python.org/projects/external/db-4.4.20-vs9 db-4.4.20