diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2012-05-18 13:34:22 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2012-05-18 13:34:22 (GMT) |
| commit | 3f90311bfeb87b869d7db5ea852dbd594de3378e (patch) | |
| tree | b4296447a7e30563d5e990da5d95ec18bf146355 /PCbuild | |
| parent | 91d5e837cab7d2080139581c2f21899d7d3a6841 (diff) | |
| parent | b15d1a7981bcd0fc37b0f391dd98a96a5ed82d63 (diff) | |
| download | cpython-3f90311bfeb87b869d7db5ea852dbd594de3378e.zip cpython-3f90311bfeb87b869d7db5ea852dbd594de3378e.tar.gz cpython-3f90311bfeb87b869d7db5ea852dbd594de3378e.tar.bz2 | |
merge 3.2
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/build_ssl.py | 2 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 6a270f1..a0ef06d 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -46,7 +46,7 @@ def find_all_on_path(filename, extras = None): # 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 index fbeb5ae..522ac88 100644 --- 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 index 9a33d94..a45ed17 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -148,7 +148,7 @@ _ssl 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 |