[Python-checkins] cpython: Update xz to 5.0.5.

[martin.v.loewis]

http://hg.python.org/cpython/rev/c5e7c83641cb
changeset:   87355:c5e7c83641cb
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Fri Nov 22 19:13:51 2013 +0100
summary:
  Update xz to 5.0.5.

files:
  Misc/NEWS                          |  2 +-
  PC/VS9.0/pyproject.vsprops         |  2 +-
  PCbuild/pyproject.props            |  2 +-
  PCbuild/readme.txt                 |  6 +++---
  Tools/buildbot/external-common.bat |  5 +++--
  5 files changed, 9 insertions(+), 8 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.
 
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
--- 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
--- 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
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -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.
 
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -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
 )

-- 
Repository URL: http://hg.python.org/cpython