diff options
| author | Martin v. L?wis <martin@v.loewis.de> | 2013-11-22 19:13:51 +0100 |
|---|---|---|
| committer | Martin v. L?wis <martin@v.loewis.de> | 2013-11-22 19:13:51 +0100 |
| commit | ae8ef128df464b2ac1d5ff325cdebb0e828a35d3 (patch) | |
| tree | bb6d0a8921dfb0f5bd03445e94f02174e6facdb6 | |
| parent | 64dc554b384f287f4f8aff2d0cdc12fc326bd0fc (diff) | |
| download | cpython-ae8ef128df464b2ac1d5ff325cdebb0e828a35d3.tar.gz | |
Update xz to 5.0.5.
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | PC/VS9.0/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 6 | ||||
| -rw-r--r-- | Tools/buildbot/external-common.bat | 5 |
5 files changed, 9 insertions, 8 deletions
@@ -352,7 +352,7 @@ Tests Build ----- -- Update SQLite to 3.8.1 on Windows. +- Update SQLite to 3.8.1 and xz to 5.0.5 on Windows. - Issue #16632: Enable DEP and ASLR on Windows. diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops index 00d34913d9..ed5464d202 100644 --- a/PC/VS9.0/pyproject.vsprops +++ b/PC/VS9.0/pyproject.vsprops @@ -58,7 +58,7 @@ />
<UserMacro
Name="lzmaDir"
- Value="$(externalsDir)\xz-5.0.3"
+ Value="$(externalsDir)\xz-5.0.5"
/>
<UserMacro
Name="opensslDir"
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index ebce448990..c78a523ad0 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -19,7 +19,7 @@ <externalsDir>..\..</externalsDir> <sqlite3Dir>$(externalsDir)\sqlite-3.8.1</sqlite3Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> - <lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir> + <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> <opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir> <tcltkDir>$(externalsDir)\tcltk</tcltkDir> <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index e7e09624f2..de8e93c7b6 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -162,7 +162,7 @@ _bz2 http://www.bzip.org/ _lzma Python wrapper for the liblzma compression library, using pre-built - binaries of XZ Utils version 5.0.3 + binaries of XZ Utils version 5.0.5 Homepage: http://tukaani.org/xz/ _ssl @@ -243,8 +243,8 @@ in ..\.. (relative to this directory). It is also possible to download sources from each project's homepage, though you may have to change the names of some folders in order to make -things work. For instance, if you were to download a version 5.0.5 of -XZ Utils, you would need to extract the archive into ..\..\xz-5.0.3 +things work. For instance, if you were to download a version 5.0.7 of +XZ Utils, you would need to extract the archive into ..\..\xz-5.0.5 anyway, since that is where the solution is set to look for xz. The same is true for all other external projects. diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index 0e76556cf7..e8ee936f8b 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -43,6 +43,7 @@ if not exist sqlite-3.8.1 ( ) @rem lzma -if not exist xz-5.0.3 ( - svn export http://svn.python.org/projects/external/xz-5.0.3 +if not exist xz-5.0.5 ( + rd /s/q xz-5.0.3 + svn export http://svn.python.org/projects/external/xz-5.0.5 ) |