You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/01/22 20:43:21 UTC
svn commit: r1654027 -
/subversion/trunk/build/generator/gen_win_dependencies.py
Author: rhuijben
Date: Thu Jan 22 19:43:20 2015
New Revision: 1654027
URL: http://svn.apache.org/r1654027
Log:
* generator/gen_win_dependencies.py
(_find_openssl): Update regex to support OpenSSL's new formatting rules.
Modified:
subversion/trunk/build/generator/gen_win_dependencies.py
Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1654027&r1=1654026&r2=1654027&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Thu Jan 22 19:43:20 2015
@@ -838,7 +838,7 @@ class GenDependenciesBase(gen_base.Gener
txt = open(version_path).read()
vermatch = re.search(
- r'#define OPENSSL_VERSION_TEXT\s+"OpenSSL\s+((\d+)\.(\d+).(\d+)([^ -]*))',
+ r'#\s*define\s+OPENSSL_VERSION_TEXT\s+"OpenSSL\s+((\d+)\.(\d+).(\d+)([^ -]*))',
txt)
version = (int(vermatch.group(2)),