From 71f3f922620035045759548246b1f562bd7e0977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Fri, 18 May 2012 14:16:53 +0200 Subject: Fetch openssl directory from pyproject.vsprops. --- PCbuild/build_ssl.py | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 2cf7fc6883..938812494a 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -63,37 +63,13 @@ def find_working_perl(perls): print(" Please install ActivePerl and ensure it appears on your path") return None -# Locate the best SSL directory given a few roots to look into. -def find_best_ssl_dir(sources): - candidates = [] - for s in sources: - try: - # note: do not abspath s; the build will fail if any - # higher up directory name has spaces in it. - fnames = os.listdir(s) - except os.error: - fnames = [] - for fname in fnames: - fqn = os.path.join(s, fname) - if os.path.isdir(fqn) and fname.startswith("openssl-"): - candidates.append(fqn) - # Now we have all the candidates, locate the best. - best_parts = [] - best_name = None - for c in candidates: - parts = re.split("[.-]", os.path.basename(c))[1:] - # eg - openssl-0.9.7-beta1 - ignore all "beta" or any other qualifiers - if len(parts) >= 4: - continue - if parts > best_parts: - best_parts = parts - best_name = c - if best_name is not None: - print("Found an SSL directory at '%s'" % (best_name,)) - else: - print("Could not find an SSL directory in '%s'" % (sources,)) - sys.stdout.flush() - return best_name +# Fetch SSL directory from VC properties +def get_ssl_dir(): + propfile = (os.path.join(os.path.dirname(__file__), 'pyproject.vsprops')) + with open(propfile) as f: + m = re.search('openssl-([^"]+)"', f.read()) + return "..\..\openssl-"+m.group(1) + def create_makefile64(makefile, m32): """Create and fix makefile for 64bit @@ -202,7 +178,7 @@ def main(): print("No Perl installation was found. Existing Makefiles are used.") sys.stdout.flush() # Look for SSL 2 levels up from pcbuild - ie, same place zlib etc all live. - ssl_dir = find_best_ssl_dir(("..\\..",)) + ssl_dir = get_ssl_dir() if ssl_dir is None: sys.exit(1) -- cgit v1.2.1 From e9dfb0f8229e6477f2d22753252dfb78fd3e25d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Fri, 18 May 2012 14:17:43 +0200 Subject: Add another set of quotes to make cmd.exe happy. --- PCbuild/build_ssl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 938812494a..04ad77bf44 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -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('"%s" -e "use Win32;"' % perl) + fh = os.popen('""%s" -e "use Win32;""' % perl) fh.read() rc = fh.close() if rc: -- cgit v1.2.1 From d18c397ed627b2c6885066bc95ae68d4ac255390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Fri, 18 May 2012 14:20:04 +0200 Subject: Port to VS 2010. --- PCbuild/build_ssl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py index 04ad77bf44..6a270f1ad9 100644 --- a/PCbuild/build_ssl.py +++ b/PCbuild/build_ssl.py @@ -65,9 +65,9 @@ def find_working_perl(perls): # Fetch SSL directory from VC properties def get_ssl_dir(): - propfile = (os.path.join(os.path.dirname(__file__), 'pyproject.vsprops')) + propfile = (os.path.join(os.path.dirname(__file__), 'pyproject.props')) with open(propfile) as f: - m = re.search('openssl-([^"]+)"', f.read()) + m = re.search('openssl-([^<]+)<', f.read()) return "..\..\openssl-"+m.group(1) -- cgit v1.2.1