Update xz to 5.0.5.

diff --git a/Misc/NEWS b/Misc/NEWS
index 940aa69d0c622542cb30dd3b0c91ef25fc41347f..70ed34c97b75f608ea47d5f224eefe1f8047615d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 00d34913d9929f3e038f72a9527a44f7f32273a6..ed5464d202e9f0b97903d83507f7d7c864a254f0 100644 (file)
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -58,7 +58,7 @@
        />\r
        <UserMacro\r
                Name="lzmaDir"\r
-               Value="$(externalsDir)\xz-5.0.3"\r
+               Value="$(externalsDir)\xz-5.0.5"\r
        />\r
        <UserMacro\r
                Name="opensslDir"\r

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index ebce448990f244186fca5e7502797f1442a4c1e7..c78a523ad09187be6dddbb4b74b6caf933225359 100644 (file)
--- 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 e7e09624f2f8cff03541d0bba21ec7dafabb419f..de8e93c7b6935ceb8a37a94b5af0f2cf3527acf9 100644 (file)
--- 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 0e76556cf721ae9e3a0f18e5d02ca66ca3bd761b..e8ee936f8bfc7eb03003c934a08391c8c274fdfc 100644 (file)
--- 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
 )