You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/10/27 05:02:21 UTC
svn commit: r1536049 - in /subversion/branches/1.8.x: ./ STATUS
build/generator/gen_win.py
Author: svn-role
Date: Sun Oct 27 04:02:21 2013
New Revision: 1536049
URL: http://svn.apache.org/r1536049
Log:
Merge the r1501656 group from trunk:
* r1501656, r1501702
Fix the ability to build Debug Build with BDB FS on Windows.
Justification:
Our build system should work properly.
Votes:
+1: breser, stefan2
+1: rhuijben (I prefer the trunk code that performs a real bdb install
check, but it might help in some dev environments)
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/build/generator/gen_win.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1501656,1501702
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1536049&r1=1536048&r2=1536049&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sun Oct 27 04:02:21 2013
@@ -144,12 +144,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1501656, r1501702
- Fix the ability to build Debug Build with BDB FS on Windows.
- Justification:
- Our build system should work properly.
- Votes:
- +1: breser, stefan2
- +1: rhuijben (I prefer the trunk code that performs a real bdb install
- check, but it might help in some dev environments)
Modified: subversion/branches/1.8.x/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/gen_win.py?rev=1536049&r1=1536048&r2=1536049&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_win.py Sun Oct 27 04:02:21 2013
@@ -220,6 +220,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
@@ -238,7 +241,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")