[Python-checkins] cpython (merge 3.2 -> default): merge 3.2
martin.v.loewis
python-checkins at python.org
Fri May 18 15:34:38 CEST 2012
http://hg.python.org/cpython/rev/608105fd0edc
changeset: 77031:608105fd0edc
parent: 77028:61ec31dec331
parent: 77030:26818230822a
user: Martin v. Löwis <martin at v.loewis.de>
date: Fri May 18 15:34:22 2012 +0200
summary:
merge 3.2
files:
PC/VC6/readme.txt | 5 ++---
PC/VS8.0/pyproject.vsprops | 2 +-
PC/VS9.0/pyproject.vsprops | 2 +-
PCbuild/build_ssl.py | 2 +-
PCbuild/pyproject.props | 2 +-
PCbuild/readme.txt | 2 +-
Tools/buildbot/external-common.bat | 4 ++--
7 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -153,10 +153,9 @@
Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as
- dist/openssl-1.0.0a
+ dist/openssl-1.0.0j
- You can (theoretically) use any version of OpenSSL you like - the
- build process will automatically select the latest version.
+ You need to use version 1.0.0j of OpenSSL.
You can install the NASM assembler from
http://www.nasm.us/
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
@@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0a"
+ Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"
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
@@ -62,7 +62,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0a"
+ Value="$(externalsDir)\openssl-1.0.0j"
/>
<UserMacro
Name="tcltkDir"
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -46,7 +46,7 @@
# is available.
def find_working_perl(perls):
for perl in perls:
- fh = os.popen('""%s" -e "use Win32;""' % perl)
+ fh = os.popen('"%s" -e "use Win32;"' % perl)
fh.read()
rc = fh.close()
if rc:
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -7,7 +7,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
- <opensslDir>$(externalsDir)\openssl-1.0.0a</opensslDir>
+ <opensslDir>$(externalsDir)\openssl-1.0.0j</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -148,7 +148,7 @@
Get the source code through
- svn export http://svn.python.org/projects/external/openssl-1.0.0a
+ svn export http://svn.python.org/projects/external/openssl-1.0.0j
** 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
@@ -14,7 +14,7 @@
@rem if exist tk8.4.16 rd /s/q tk8.4.16
@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
- at rem if exist openssl-1.0.0a rd /s/q openssl-1.0.0a
+ at rem if exist openssl-1.0.0j rd /s/q openssl-1.0.0j
@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
@rem bzip
@@ -24,7 +24,7 @@
)
@rem OpenSSL
-if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a
+if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j
@rem tcl/tk
if not exist tcl-8.5.11.0 (
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list