diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-12-09 08:01:18 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-12-09 08:01:18 (GMT) |
| commit | 59734be36c891bbebc1e547e36997b0dc11d76fb (patch) | |
| tree | 2bda0d1d771659a0255dedb73ae7f2adbd934f00 /PCbuild | |
| parent | 517858adb5ee34cf29a257a5b0152a8413a04d91 (diff) | |
| download | cpython-59734be36c891bbebc1e547e36997b0dc11d76fb.zip cpython-59734be36c891bbebc1e547e36997b0dc11d76fb.tar.gz cpython-59734be36c891bbebc1e547e36997b0dc11d76fb.tar.bz2 | |
Merged revisions 85071-85072,85894,87132 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85071 | hirokazu.yamamoto | 2010-09-29 03:29:57 +0900 (水, 29 9 2010) | 1 line
Now perl path with spaces can be used.
........
r85072 | hirokazu.yamamoto | 2010-09-29 03:36:04 +0900 (水, 29 9 2010) | 1 line
Updated PC/VC6 openssl build script. (for openssl-1.0.0a)
........
r85894 | hirokazu.yamamoto | 2010-10-29 02:57:25 +0900 (金, 29 10 2010) | 1 line
Updated readme.txt about OpenSSL.
........
r87132 | hirokazu.yamamoto | 2010-12-08 23:47:07 +0900 (水, 08 12 2010) | 3 lines
Mention NASM which is needed to build openssl-1.0.0a original source.
(PC/VC6/readme.txt)
........
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/build_ssl.py | 8 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index bf0c409..f81e0bc 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -47,7 +47,7 @@ def find_all_on_path(filename, extras = None): # is available. def find_working_perl(perls): for perl in perls: - fh = os.popen(perl + ' -e "use Win32;"') + fh = os.popen('"%s" -e "use Win32;"' % perl) fh.read() rc = fh.close() if rc: @@ -184,10 +184,10 @@ def main(): # as "well known" locations perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"]) perl = find_working_perl(perls) - if perl is None: + if perl: + print("Found a working perl at '%s'" % (perl,)) + else: print("No Perl installation was found. Existing Makefiles are used.") - - print("Found a working perl at '%s'" % (perl,)) sys.stdout.flush() # Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live. ssl_dir = find_best_ssl_dir(("..\\..",)) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 437e0d9..366fc07 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -159,7 +159,7 @@ _ssl nasmw.exe. You can also install ActivePerl from - http://www.activestate.com/Products/ActivePerl/ + http://www.activestate.com/activeperl/ if you like to use the official sources instead of the files from python's subversion repository. The svn version contains pre-build makefiles and assembly files. |