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)
........
This commit is contained in:
Hirokazu Yamamoto 2010-12-09 09:25:38 +00:00
parent a85b671cb6
commit ba466cd208
5 changed files with 65 additions and 28 deletions

View file

@ -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(perl + ' -e "use Win32;"')
fh = os.popen('"%s" -e "use Win32;"' % perl)
fh.read()
rc = fh.close()
if rc:
@ -186,10 +186,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(("..\\..",))

View file

@ -156,7 +156,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.