aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2012-05-14 13:52:03 +0200
committerMartin v. Löwis <martin@v.loewis.de>2012-05-14 13:52:03 +0200
commitecc5877f5af6d2fd2d2de73ed5e8ede9f57c13f4 (patch)
treec6a2cc858dfb8ad9c485ce7136729d805d8b8e86 /PCbuild
parentIssue #13815: Resurrect the ExFileObject class. (diff)
downloadcpython-ecc5877f5af6d2fd2d2de73ed5e8ede9f57c13f4.tar.gz
cpython-ecc5877f5af6d2fd2d2de73ed5e8ede9f57c13f4.tar.bz2
cpython-ecc5877f5af6d2fd2d2de73ed5e8ede9f57c13f4.zip
Upgrade bzip2 to 1.0.6.
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/pyproject.props2
-rw-r--r--PCbuild/readme.txt10
2 files changed, 6 insertions, 6 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 4b7081c960c..fb4efbb106b 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -5,7 +5,7 @@
<PythonExe>$(SolutionDir)\python.exe</PythonExe>
<externalsDir>..\..</externalsDir>
<sqlite3Dir>$(externalsDir)\sqlite-3.7.4</sqlite3Dir>
- <bz2Dir>$(externalsDir)\bzip2-1.0.5</bz2Dir>
+ <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
<opensslDir>$(externalsDir)\openssl-1.0.0a</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 2146221b1d7..9a33d947194 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.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.
_lzma
Python wrapper for the liblzma compression library.