diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-05-14 12:13:48 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-05-14 12:13:48 (GMT) |
| commit | 87960da3e3a71122acd14cd92d5313e87021c7d4 (patch) | |
| tree | 5b0310c65bf2dfcfe4194df5bc0e08362e292b21 /PCbuild | |
| parent | e768b06f160291ed8c4bc50933e3fc179589516f (diff) | |
| download | cpython-87960da3e3a71122acd14cd92d5313e87021c7d4.zip cpython-87960da3e3a71122acd14cd92d5313e87021c7d4.tar.gz cpython-87960da3e3a71122acd14cd92d5313e87021c7d4.tar.bz2 | |
Upgrade bzip2 to 1.0.6.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/bz2.vcproj | 4 | ||||
| -rw-r--r-- | PCbuild/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj index 035736e..e2b353b 100644 --- a/PCbuild/bz2.vcproj +++ b/PCbuild/bz2.vcproj @@ -532,7 +532,7 @@ </File>
</Filter>
<Filter
- Name="bzip2 1.0.5 Header Files"
+ Name="bzip2 1.0.6 Header Files"
>
<File
RelativePath="$(bz2Dir)\bzlib.h"
@@ -544,7 +544,7 @@ </File>
</Filter>
<Filter
- Name="bzip2 1.0.5 Source Files"
+ Name="bzip2 1.0.6 Source Files"
>
<File
RelativePath="$(bz2Dir)\blocksort.c"
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 3f69a42..881befd 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -54,7 +54,7 @@ />
<UserMacro
Name="bz2Dir"
- Value="$(externalsDir)\bzip2-1.0.5"
+ Value="$(externalsDir)\bzip2-1.0.6"
/>
<UserMacro
Name="opensslDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index dbe031f..3bb6492 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -118,21 +118,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. _ssl Python wrapper for the secure sockets library. |