diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-06-13 17:28:35 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-06-13 17:28:35 +0000 |
| commit | 70ce8aae98e844feaf6a8db1b7f40ed507a0cd41 (patch) | |
| tree | f6400d2c447a8fabfd8e8a4ecfcb630217f38106 /PCbuild | |
| parent | af065c34bc232993544317a3aa827a61e44a30ab (diff) | |
| download | cpython-git-70ce8aae98e844feaf6a8db1b7f40ed507a0cd41.tar.gz | |
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.
........
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 3633aeb4fd..eb6ab328f2 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 a55c1f1079..f56828d911 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. |