svn commit: r1574561 - in /subversion/trunk: build/generator/gen_win_dependencies.py gen-make.py

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar  5 16:21:16 2014
New Revision: 1574561

URL: http://svn.apache.org/r1574561
Log:
Remove some (since at least 1.8.0) unused gen-make options, from when we only
supported in-tree builds of bdb and apr-util.

* gen-make.py
  Remove support for --enable-bdb-in-apr-util,
  --with-neon and --without-neon.

* build/generator/gen_win_dependencies.py
  Stop parsing enable-bdb-in-apr-util.

Modified:
    subversion/trunk/build/generator/gen_win_dependencies.py
    subversion/trunk/gen-make.py

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1574561&r1=1574560&r2=1574561&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Wed Mar  5 16:21:16 2014
@@ -161,7 +161,6 @@ class GenDependenciesBase(gen_base.Gener
     self.static_openssl = None
     self.instrument_apr_pools = None
     self.instrument_purify_quantify = None
-    self.configure_apr_util = None
     self.sasl_path = None
     self.cpp_defines = []
 
@@ -210,8 +209,6 @@ class GenDependenciesBase(gen_base.Gener
         self.instrument_apr_pools = 1
       elif opt == '--enable-nls':
         self.enable_nls = 1
-      elif opt == '--enable-bdb-in-apr-util':
-        self.configure_apr_util = 1
       elif opt == '--disable-shared':
         self.disable_shared = 1
       elif opt == '--with-static-apr':

Modified: subversion/trunk/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/gen-make.py?rev=1574561&r1=1574560&r2=1574561&view=diff
==============================================================================
--- subversion/trunk/gen-make.py (original)
+++ subversion/trunk/gen-make.py Wed Mar  5 16:21:16 2014
@@ -193,9 +193,6 @@ def _usage_exit(err=None):
   print("  --enable-nls")
   print("           add support for gettext localization")
   print("")
-  print("  --enable-bdb-in-apr-util")
-  print("           configure APR-Util to use Berkeley DB")
-  print("")
   print("  --disable-shared")
   print("           only build static libraries")
   print("")
@@ -262,17 +259,10 @@ if __name__ == '__main__':
                             'enable-purify',
                             'enable-quantify',
                             'enable-nls',
-                            'enable-bdb-in-apr-util',
                             'disable-shared',
                             'installed-libs=',
                             'vsnet-version=',
                             'disable-gmock',
-                            # Keep distributions that help by adding a path
-                            # working. On unix this would be filtered by
-                            # configure, but on Windows gen-make.py is used
-                            # directly.
-                            'with-neon=',
-                            'without-neon',
                             ])
     if len(args) > 1:
       _usage_exit("Too many arguments")