Author: breser
Date: Wed Jul 10 06:23:06 2013
New Revision: 1501656
URL: http://svn.apache.org/r1501656
Log:
Fix the ability to build against debug BDB on Windows.
Not sure this is the best way to fix this, the real problem here is that
when we look for BDB we have no idea if this is a debug or release build.
* build/generator/gen_win.py
(GeneratorBase._find_bdb): Look for the debug lib as well as release.
(WinGeneratorBase.__init__): Adjust output since it doesn't know if it
found a release or debug lib file at this layer.
Modified:
subversion/trunk/build/generator/gen_win.py
Modified: subversion/trunk/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1501656&r1=1501655&r2=1501656&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Wed Jul 10 06:23:06 2013
@@ -225,6 +225,9 @@ class GeneratorBase(gen_base.GeneratorBa
if os.path.exists(os.path.join(path, lib + ".lib")):
self.bdb_lib = lib
break
+ elif os.path.exists(os.path.join(path, lib + "d.lib")):
+ self.bdb_lib = lib
+ break
else:
self.bdb_lib = None
@@ -243,7 +246,8 @@ class WinGeneratorBase(GeneratorBase):
GeneratorBase.__init__(self, fname, verfname, options)
if self.bdb_lib is not None:
- print("Found %s.lib in %s\n" % (self.bdb_lib, self.bdb_path))
+ print("Found %s.lib or %sd.lib in %s\n" % (self.bdb_lib, self.bdb_lib,
+ self.bdb_path))
else:
print("BDB not found, BDB fs will not be built\n")
