Backport of 42993:

Update to bzip2 1.0.3
Make buildbot slaves automatically fetch bzip2 1.0.3.

diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj
index 4e8ef9807e2bf318de331787030749659cd9a6cd..2b31c631c08b5d6e453e341112064afc64d8f9cd 100644 (file)
--- a/PCbuild/bz2.vcproj
+++ b/PCbuild/bz2.vcproj
@@ -21,7 +21,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.2"
+                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="2"
@@ -37,7 +37,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib"
+                               AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
                                OutputFile="./bz2_d.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -62,7 +62,7 @@
                                Name="VCPreBuildEventTool"/>
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="cd ..\..\bzip2-1.0.2
+                               CommandLine="cd ..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc
 "/>
                        <Tool
@@ -91,7 +91,7 @@ nmake /nologo /f makefile.msc
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.2"
+                               AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
                                StringPooling="TRUE"
                                RuntimeLibrary="2"
@@ -109,7 +109,7 @@ nmake /nologo /f makefile.msc
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib"
+                               AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
                                OutputFile="./bz2.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -134,7 +134,7 @@ nmake /nologo /f makefile.msc
                                Name="VCPreBuildEventTool"/>
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="cd ..\..\bzip2-1.0.2
+                               CommandLine="cd ..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc lib
 "/>
                        <Tool
@@ -164,7 +164,7 @@ nmake /nologo /f makefile.msc lib
                                AdditionalOptions=" /USECL:MS_ITANIUM"
                                Optimization="2"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\bzip2-1.0.2"
+                               AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\bzip2-1.0.3"
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
                                StringPooling="TRUE"
                                BasicRuntimeChecks="0"
@@ -186,7 +186,7 @@ nmake /nologo /f makefile.msc lib
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-                               AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib"
+                               AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
                                OutputFile="./bz2.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -211,7 +211,7 @@ nmake /nologo /f makefile.msc lib
                                Name="VCPreBuildEventTool"/>
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="cd ..\..\bzip2-1.0.2
+                               CommandLine="cd ..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc lib
 "/>
                        <Tool

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index aed1c9c876dee208e8db7e33267e080367f34fac..5f7beda5ec77a4cdb596cf8e5479fc0a01e3d5a1 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -139,17 +139,15 @@ zlib
 bz2
     Python wrapper for the libbz2 compression library.  Homepage
         http://sources.redhat.com/bzip2/
-    Download the source tarball, bzip2-1.0.2.tar.gz.
-    Unpack into dist\bzip2-1.0.2.  WARNING:  If you're using WinZip, you
-    must disable its "TAR file smart CR/LF conversion" feature (under
-    Options -> Configuration -> Miscellaneous -> Other) for the duration.
+    Download the source from the python.org copy:
+    svn export http://svn.python.org/projects/external/bzip2-1.0.3
 
     A custom pre-link step in the bz2 project settings should manage to
     build bzip2-1.0.2\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.2\ when you do a clean, so if you want to rebuild bzip2.lib
-    you need to clean up bzip2-1.0.2\ by hand.
+    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.
 
     The build step shouldn't yield any warnings or errors, and should end
     by displaying 6 blocks each terminated with
@@ -157,7 +155,7 @@ bz2
     If FC finds differences, see the warning abou WinZip above (when I
     first tried it, sample3.ref failed due to CRLF conversion).
 
-    All of this managed to build bzip2-1.0.2\libbz2.lib, which the Python
+    All of this managed to build bzip2-1.0.3\libbz2.lib, which the Python
     project links in.
 
 

diff --git a/Tools/buildbot/build.bat b/Tools/buildbot/build.bat
index 00bbdbb72b513a164f716fb39376ddaa9b1105bb..e3b77be2f12b491c9f212fc753fd3f813f2bfd23 100644 (file)
--- a/Tools/buildbot/build.bat
+++ b/Tools/buildbot/build.bat
@@ -1,3 +1,4 @@
 @rem Used by the buildbot "compile" step.
+cmd /c Tools\buildbot\external.bat
 call "%VS71COMNTOOLS%vsvars32.bat"
 devenv.com /useenv /build Debug PCbuild\pcbuild.sln

diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat
new file mode 100644 (file)
index 0000000..5dd1114
--- /dev/null
+++ b/Tools/buildbot/external.bat
@@ -0,0 +1,8 @@
+@rem Fetches (and builds if necessary) external dependencies\r
+\r
+@rem Assume we start inside the Python source directory\r
+cd ..\r
+\r
+@rem bzip\r
+if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3\r
+\r