Commit 313dab43 authored by Hirokazu Yamamoto's avatar Hirokazu Yamamoto

Now perl path with spaces can be used.

parent 57b41630
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# directory. It is likely you will already find the zlib library and # directory. It is likely you will already find the zlib library and
# any other external packages there. # any other external packages there.
# * Install ActivePerl and ensure it is somewhere on your path. # * 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 # it should configure and build SSL, then build the _ssl and _hashlib
# Python extensions without intervention. # Python extensions without intervention.
...@@ -46,7 +46,7 @@ def find_all_on_path(filename, extras = None): ...@@ -46,7 +46,7 @@ def find_all_on_path(filename, extras = None):
# is available. # is available.
def find_working_perl(perls): def find_working_perl(perls):
for perl in perls: for perl in perls:
fh = os.popen(perl + ' -e "use Win32;"') fh = os.popen('"%s" -e "use Win32;"' % perl)
fh.read() fh.read()
rc = fh.close() rc = fh.close()
if rc: if rc:
...@@ -196,12 +196,12 @@ def main(): ...@@ -196,12 +196,12 @@ def main():
# as "well known" locations # as "well known" locations
perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"]) perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"])
perl = find_working_perl(perls) 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("No Perl installation was found. Existing Makefiles are used.")
print("Found a working perl at '%s'" % (perl,))
sys.stdout.flush() 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(("..\\..\\..",)) ssl_dir = find_best_ssl_dir(("..\\..\\..",))
if ssl_dir is None: if ssl_dir is None:
sys.exit(1) sys.exit(1)
......
...@@ -46,7 +46,7 @@ def find_all_on_path(filename, extras = None): ...@@ -46,7 +46,7 @@ def find_all_on_path(filename, extras = None):
# is available. # is available.
def find_working_perl(perls): def find_working_perl(perls):
for perl in perls: for perl in perls:
fh = os.popen(perl + ' -e "use Win32;"') fh = os.popen('"%s" -e "use Win32;"' % perl)
fh.read() fh.read()
rc = fh.close() rc = fh.close()
if rc: if rc:
...@@ -196,10 +196,10 @@ def main(): ...@@ -196,10 +196,10 @@ def main():
# as "well known" locations # as "well known" locations
perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"]) perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"])
perl = find_working_perl(perls) 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("No Perl installation was found. Existing Makefiles are used.")
print("Found a working perl at '%s'" % (perl,))
sys.stdout.flush() sys.stdout.flush()
# Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live. # Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live.
ssl_dir = find_best_ssl_dir(("..\\..",)) ssl_dir = find_best_ssl_dir(("..\\..",))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment