Mercurial > cpython-lru_cache-weakref
changeset 87355:c5e7c83641cb
Update xz to 5.0.5.
| author | Martin v. Löwis <martin@v.loewis.de> |
|---|---|
| date | Fri, 22 Nov 2013 19:13:51 +0100 |
| parents | 96860eee3bf3 |
| children | 9621a37f069f |
| files | Misc/NEWS PC/VS9.0/pyproject.vsprops PCbuild/pyproject.props PCbuild/readme.txt Tools/buildbot/external-common.bat |
| diffstat | 5 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Misc/NEWS Fri Nov 22 18:36:28 2013 +0100 +++ b/Misc/NEWS Fri Nov 22 19:13:51 2013 +0100 @@ -352,7 +352,7 @@ 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.
--- a/PC/VS9.0/pyproject.vsprops Fri Nov 22 18:36:28 2013 +0100 +++ b/PC/VS9.0/pyproject.vsprops Fri Nov 22 19:13:51 2013 +0100 @@ -58,7 +58,7 @@ /> <UserMacro Name="lzmaDir" - Value="$(externalsDir)\xz-5.0.3" + Value="$(externalsDir)\xz-5.0.5" /> <UserMacro Name="opensslDir"
--- a/PCbuild/pyproject.props Fri Nov 22 18:36:28 2013 +0100 +++ b/PCbuild/pyproject.props Fri Nov 22 19:13:51 2013 +0100 @@ -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>
--- a/PCbuild/readme.txt Fri Nov 22 18:36:28 2013 +0100 +++ b/PCbuild/readme.txt Fri Nov 22 19:13:51 2013 +0100 @@ -162,7 +162,7 @@ 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 @@ 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.
--- a/Tools/buildbot/external-common.bat Fri Nov 22 18:36:28 2013 +0100 +++ b/Tools/buildbot/external-common.bat Fri Nov 22 19:13:51 2013 +0100 @@ -43,6 +43,7 @@ ) @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 )