From 14c1cf88ad6cdff5d8372273a0b7c43478c37d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Mon, 13 Mar 2006 10:52:04 +0000 Subject: Update to bzip2 1.0.3 Make buildbot slaves automatically fetch bzip2 1.0.3. --- PCbuild/bz2.vcproj | 24 ++++++++++++------------ PCbuild/readme.txt | 12 +++++------- Tools/buildbot/build.bat | 1 + Tools/buildbot/external.bat | 8 ++++++++ 4 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 Tools/buildbot/external.bat diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj index affccf9..96b2e53 100644 --- a/PCbuild/bz2.vcproj +++ b/PCbuild/bz2.vcproj @@ -21,7 +21,7 @@ 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 @@ -145,7 +143,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 00bbdbb..e3b77be 100644 --- 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 index 0000000..5dd1114 --- /dev/null +++ b/Tools/buildbot/external.bat @@ -0,0 +1,8 @@ +@rem Fetches (and builds if necessary) external dependencies + +@rem Assume we start inside the Python source directory +cd .. + +@rem bzip +if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3 + -- cgit v0.12