[Python-checkins] cpython (merge 2.7 -> 2.7): merge heads

[senthil.kumaran]

http://hg.python.org/cpython/rev/658478c37fa5
changeset:   76962:658478c37fa5
branch:      2.7
parent:      76958:b82178b07e0f
parent:      76956:458986418841
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Wed May 16 00:07:55 2012 +0800
summary:
  merge heads

files:
  Misc/NEWS                          |  2 ++
  PC/VS8.0/pyproject.vsprops         |  2 +-
  PCbuild/pyproject.vsprops          |  2 +-
  PCbuild/readme.txt                 |  2 +-
  Tools/buildbot/external-common.bat |  4 ++--
  5 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -157,6 +157,8 @@
 Build
 -----
 
+- Build against bzip2 1.0.6 and openssl 0.9.8x on Windows.
+
 - Issue #14557: Fix extensions build on HP-UX. Patch by Adi Roiban.
 
 - Issue #14437: Fix building the _io module under Cygwin.
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-0.9.8l"
+		Value="$(externalsDir)\openssl-0.9.8x"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-0.9.8l"
+		Value="$(externalsDir)\openssl-0.9.8x"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -142,7 +142,7 @@
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-0.9.8l
+    svn export http://svn.python.org/projects/external/openssl-0.9.8x
 
     ** 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
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
@@ -15,7 +15,7 @@
 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
 @rem if exist db-4.4.20 rd /s/q db-4.4.20
 @rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0
- at rem if exist openssl-0.9.8l rd /s/q openssl-0.9.8l
+ at rem if exist openssl-0.9.8x rd /s/q openssl-0.9.8x
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21    
 
 @rem bzip
@@ -29,7 +29,7 @@
 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
 
 @rem OpenSSL
-if not exist openssl-0.9.8l svn export http://svn.python.org/projects/external/openssl-0.9.8l
+if not exist openssl-0.9.8x svn export http://svn.python.org/projects/external/openssl-0.9.8x
 
 @rem tcl/tk
 if not exist tcl-8.5.2.1 (

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