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

[rh...@apache.org]

Author: rhuijben
Date: Fri Apr  9 13:33:59 2021
New Revision: 1888561

URL: http://svn.apache.org/viewvc?rev=1888561&view=rev
Log:
Following up on r1888560, reverse default logic to avoid breaking the buildbots that have libserf-1.lib installed

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=1888561&r1=1888560&r2=1888561&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Fri Apr  9 13:33:59 2021
@@ -168,7 +168,7 @@ class GenDependenciesBase(gen_base.Gener
     self.disable_shared = None
     self.static_apr = None
     self.static_openssl = None
-    self.static_serf = None
+    self.shared_serf = None
     self.instrument_apr_pools = None
     self.instrument_purify_quantify = None
     self.sasl_path = None
@@ -226,11 +226,12 @@ class GenDependenciesBase(gen_base.Gener
         self.disable_shared = 1
       elif opt == '--with-static-apr':
         self.static_apr = 1
-        self.static_serf = 1 # Can't mix apr versions
+        self.shared_serf = 0 # Can't mix apr versions
       elif opt == '--with-static-openssl':
         self.static_openssl = 1
-      elif opt == '--with-static-serf':
-        self.static_serf = 1
+      elif opt == '--with-shared-serf':
+        if not self.static_apr:
+          self.shared_serf = 1
       elif opt == '-D':
         self.cpp_defines.append(val)
       elif opt == '--vsnet-version':
@@ -1339,7 +1340,7 @@ class GenDependenciesBase(gen_base.Gener
     else:
       lib_name = 'serf.lib'
     
-    if not self.static_serf and os.path.isfile(os.path.join(lib_dir, 'lib' + lib_name)):
+    if self.shared_serf:
       lib_name = 'lib' + lib_name
 
     defines = ['SVN_HAVE_SERF', 'SVN_LIBSVN_RA_LINKS_RA_SERF']

Modified: subversion/trunk/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/gen-make.py?rev=1888561&r1=1888560&r2=1888561&view=diff
==============================================================================
--- subversion/trunk/gen-make.py (original)
+++ subversion/trunk/gen-make.py Fri Apr  9 13:33:59 2021
@@ -206,6 +206,9 @@ def _usage_exit(err=None):
   print("  --with-static-openssl")
   print("           Use static openssl")
   print("")
+  print("  --with-shared-serf")
+  print("           Use shared library version of serf")
+  print("")
   print("  --vsnet-version=VER")
   print("           generate for VS.NET version VER (2005-2017 or 9.0-15.0)")
   print("           [implies '-t vcproj']")
@@ -257,6 +260,7 @@ if __name__ == '__main__':
                             'with-apr_memcache=',
                             'with-static-apr',
                             'with-static-openssl',
+                            'with-shared-serf',
                             'enable-pool-debug',
                             'enable-purify',
                             'enable-quantify',