svn commit: r1503151 - in /subversion/trunk/build/generator: gen_win.py gen_win_dependencies.py

[rh...@apache.org]

Author: rhuijben
Date: Mon Jul 15 09:33:00 2013
New Revision: 1503151

URL: http://svn.apache.org/r1503151
Log:
* generator/gen_win.py
  Fix Exception when BDB is not found.

* generator/gen_win_dependencies.py
  Check the right variable for static openssl.
  Remove TAB character

Found by: Masaru Tsuchiyama <m.tmatma{_AT_}gmail.com>

Modified:
    subversion/trunk/build/generator/gen_win.py
    subversion/trunk/build/generator/gen_win_dependencies.py

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1503151&r1=1503150&r2=1503151&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Mon Jul 15 09:33:00 2013
@@ -73,10 +73,7 @@ class WinGeneratorBase(gen_win_dependenc
 
     self.find_libraries(True)
 
-    if self._libraries['db']:
-      db = self._libraries['db']
-      print('Found BDB %s in %s' % (db.version, self.bdb_path))
-    else:
+    if 'db' not in self._libraries:
       print('BDB not found, BDB fs will not be built')
 
     #Make some files for the installer so that we don't need to

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1503151&r1=1503150&r2=1503151&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Mon Jul 15 09:33:00 2013
@@ -651,7 +651,7 @@ class GenDependenciesBase(gen_base.Gener
                                   'include/openssl/opensslv.h')
       inc_dir = os.path.join(self.openssl_path, 'include')
       lib_dir = os.path.join(self.openssl_path, 'lib')
-      if self.static_openss:
+      if self.static_openssl:
         self.bin_dir = None
       else:
         self.bin_dir = os.path.join(self.openssl_path, 'bin')
@@ -664,7 +664,7 @@ class GenDependenciesBase(gen_base.Gener
     txt = open(version_path).read()
 
     vermatch = re.search(
-      r'#define OPENSSL_VERSION_TEXT	"OpenSSL\s+((\d+)\.(\d+).(\d+)([^ -]*))',
+      r'#define OPENSSL_VERSION_TEXT\s+"OpenSSL\s+((\d+)\.(\d+).(\d+)([^ -]*))',
       txt)
   
     version = (int(vermatch.group(2)),