subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1486286 - in /subversion/branches/1.8.x: ./ STATUS build/generator/gen_win.py
Date Sat, 25 May 2013 04:01:44 GMT
Author: svn-role
Date: Sat May 25 04:01:43 2013
New Revision: 1486286

URL: http://svn.apache.org/r1486286
Log:
Merge r1481944 from trunk:

 * r1481944
   Let Windows compile against BDB 5.0, 5.1, 5.2 and 5.3.
   Justification:
     No reason to prevent this.
   Votes:
     +1: breser (for 1.8.1), pburba, cmpilato

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:r1481944

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1486286&r1=1486285&r2=1486286&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sat May 25 04:01:43 2013
@@ -135,13 +135,6 @@ Approved changes:
 # blocking issues.  If in doubt see this link for details:
 # http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
 
- * r1481944
-   Let Windows compile against BDB 5.0, 5.1, 5.2 and 5.3.
-   Justification:
-     No reason to prevent this.
-   Votes:
-     +1: breser (for 1.8.1), pburba, cmpilato
-
  * r1483557
    Match our revision property names exactly instead of by prefix only.
    Justification:

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=1486286&r1=1486285&r2=1486286&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_win.py Sat May 25 04:01:43 2013
@@ -212,7 +212,8 @@ class GeneratorBase(gen_base.GeneratorBa
 
   def _find_bdb(self):
     "Find the Berkeley DB library and version"
-    for ver in ("48", "47", "46", "45", "44", "43", "42", "41", "40"):
+    for ver in ("53", "52", "51", "50", "48", "47", "46",
+                "45", "44", "43", "42", "41", "40"):
       lib = "libdb" + ver
       path = os.path.join(self.bdb_path, "lib")
       if os.path.exists(os.path.join(path, lib + ".lib")):



Mime
View raw message