Commit 9c18fcf1 authored by Tim Golden's avatar Tim Golden

Issue10752 Be more robust when finding a PERL interpreter to build OpenSSL....

Issue10752 Be more robust when finding a PERL interpreter to build OpenSSL. Initial patch by Gabi Davar
parent 062fcac9
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# python.exe build_ssl.py Release Win32 # python.exe build_ssl.py Release Win32
import os, sys, re, shutil import os, sys, re, shutil
import subprocess
# Find all "foo.exe" files on the PATH. # Find all "foo.exe" files on the PATH.
def find_all_on_path(filename, extras = None): def find_all_on_path(filename, extras = None):
...@@ -46,22 +47,21 @@ def find_all_on_path(filename, extras = None): ...@@ -46,22 +47,21 @@ 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('"%s" -e "use Win32;"' % perl) try:
fh.read() subprocess.check_output([perl, "-e", "use Win32;"])
rc = fh.close() except subprocess.CalledProcessError:
if rc:
continue continue
return perl else:
print("Can not find a suitable PERL:") return perl
if perls: if perls:
print(" the following perl interpreters were found:") print("The following perl interpreters were found:")
for p in perls: for p in perls:
print(" ", p) print(" ", p)
print(" None of these versions appear suitable for building OpenSSL") print(" None of these versions appear suitable for building OpenSSL")
else: else:
print(" NO perl interpreters were found on this machine at all!") print("NO perl interpreters were found on this machine at all!")
print(" Please install ActivePerl and ensure it appears on your path") print(" Please install ActivePerl and ensure it appears on your path")
return None
# Fetch SSL directory from VC properties # Fetch SSL directory from VC properties
def get_ssl_dir(): def get_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