[Python-checkins] r85071 - in python/branches/py3k: PC/VS8.0/build_ssl.py PCbuild/build_ssl.py

Tue Sep 28 20:29:57 CEST 2010

Author: hirokazu.yamamoto
Date: Tue Sep 28 20:29:57 2010
New Revision: 85071
Log:
Now perl path with spaces can be used.
Modified:
 python/branches/py3k/PC/VS8.0/build_ssl.py
 python/branches/py3k/PCbuild/build_ssl.py
Modified: python/branches/py3k/PC/VS8.0/build_ssl.py
==============================================================================

--- python/branches/py3k/PC/VS8.0/build_ssl.py	(original)
+++ python/branches/py3k/PC/VS8.0/build_ssl.py	Tue Sep 28 20:29:57 2010
@@ -8,7 +8,7 @@
 # directory. It is likely you will already find the zlib library and
 # any other external packages there.
 # * Install ActivePerl and ensure it is somewhere on your path.
-# * Run this script from the PCBuild directory.
+# * Run this script from the PC/VS8.0 directory.
 #
 # it should configure and build SSL, then build the _ssl and _hashlib
 # Python extensions without intervention.
@@ -46,7 +46,7 @@
 # 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:
@@ -196,12 +196,12 @@
 # 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.
+ # Look for SSL 3 levels up from PC/VS8.0 - ie, same place zlib etc all live.
 ssl_dir = find_best_ssl_dir(("..\\..\\..",))
 if ssl_dir is None:
 sys.exit(1)
Modified: python/branches/py3k/PCbuild/build_ssl.py
==============================================================================
--- python/branches/py3k/PCbuild/build_ssl.py	(original)
+++ python/branches/py3k/PCbuild/build_ssl.py	Tue Sep 28 20:29:57 2010
@@ -46,7 +46,7 @@
 # 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:
@@ -196,10 +196,10 @@
 # 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(("..\\..",))
