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

[rh...@apache.org]

Author: rhuijben
Date: Tue Jul 21 12:07:57 2015
New Revision: 1692093

URL: http://svn.apache.org/r1692093
Log:
On Windows: drop BDB not found warning, if building without BDB-support.
This makes this code match the *nix configure code.

* build/generator/gen_win.py
   (__init__): Remove BDB-warning, if optional 'db' library not found in
               self._libraries

* build/generator/gen_win_dependencies.py
   (parse_options): initialize self.bdb_path to None.
   (_find_bdb): introduce local variable to determine bdb_path taking 
                either a specified path (via --with-berkeley-db) or
                attempting the legacy default path ('db4-win32')
                Only issue the warning, if failing to locate the BDB path
                AND the user having explicitly specified the bdb-path.

Patch by: Stefan Hett <stefan{_AT_}egosoft.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=1692093&r1=1692092&r2=1692093&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue Jul 21 12:07:57 2015
@@ -90,9 +90,6 @@ class WinGeneratorBase(gen_win_dependenc
       printed.append(lib.name)
       print('Found %s %s' % (lib.name, lib.version))
 
-    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
     #require sed or some other command to do it
     ### GJS: don't do this right now

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1692093&r1=1692092&r2=1692093&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Tue Jul 21 12:07:57 2015
@@ -137,7 +137,7 @@ class GenDependenciesBase(gen_base.Gener
     self.apr_util_path = 'apr-util'
     self.apr_iconv_path = 'apr-iconv'
     self.serf_path = None
-    self.bdb_path = 'db4-win32'
+    self.bdb_path = None
     self.httpd_path = None
     self.libintl_path = None
     self.zlib_path = 'zlib'
@@ -748,11 +748,18 @@ class GenDependenciesBase(gen_base.Gener
 
     # Default to not found
     self.bdb_lib = None
-
-    inc_path = os.path.join(self.bdb_path, 'include')
+    
+    # try default path to detect BDB support, unless different path is
+    # specified so to keep pre 1.10-behavior for BDB detection on Windows
+    bdb_path = 'db4-win32'
+
+    if self.bdb_path:
+      bdb_path = self.bdb_path
+    
+    inc_path = os.path.join(bdb_path, 'include')
     db_h_path = os.path.join(inc_path, 'db.h')
 
-    if not self.bdb_path or not os.path.isfile(db_h_path):
+    if not os.path.isfile(db_h_path):
       if show_warnings and self.bdb_path:
         print('WARNING: \'%s\' not found' % (db_h_path,))
         print("Use '--with-berkeley-db' to configure BDB location.");
@@ -782,7 +789,7 @@ class GenDependenciesBase(gen_base.Gener
        ):
       return
 
-    lib_dir = os.path.join(self.bdb_path, 'lib')
+    lib_dir = os.path.join(bdb_path, 'lib')
     lib_name = 'libdb%s.lib' % (versuffix,)
 
     if not os.path.exists(os.path.join(lib_dir, lib_name)):
@@ -793,7 +800,7 @@ class GenDependenciesBase(gen_base.Gener
     if not os.path.isfile(os.path.join(lib_dir, debug_lib_name)):
       debug_lib_name = None
 
-    dll_dir = os.path.join(self.bdb_path, 'bin')
+    dll_dir = os.path.join(bdb_path, 'bin')
 
     # Are there binaries we should copy for testing?
     dll_name = os.path.splitext(lib_name)[0] + '.dll'