subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1504193 - /subversion/trunk/build/generator/gen_win.py
Date Wed, 17 Jul 2013 16:37:35 GMT
Author: rhuijben
Date: Wed Jul 17 16:37:35 2013
New Revision: 1504193

URL: http://svn.apache.org/r1504193
Log:
* gen_win.py
  Don't generate a zlib project and bat file if we are using an install source.
  Suppress gen-make.py warnings when compiling without serf or bdb.

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=1504193&r1=1504192&r2=1504193&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Wed Jul 17 16:37:35 2013
@@ -98,7 +98,7 @@ class WinGeneratorBase(gen_win_dependenc
       os.makedirs(self.projfilesdir)
 
     # Generate the build_zlib.bat file
-    if self.zlib_path:
+    if self._libraries['zlib'].is_src:
       data = {'zlib_path': os.path.relpath(self.zlib_path, self.projfilesdir),
               'zlib_version': self.zlib_version,
               'use_ml': self.have_ml and 1 or None}
@@ -937,6 +937,10 @@ class WinGeneratorBase(gen_win_dependenc
              external_lib == 'magic':
           # Currently unhandled
           lib = None
+          
+        elif external_lib in ['db',
+                              'serf']:
+          lib = None                              
 
         else:
           print('Warning: Using underclared dependency \'%s\'' % \
@@ -993,7 +997,7 @@ class WinGeneratorBase(gen_win_dependenc
     self.write_file_if_changed(fname, fout.getvalue())
 
   def write_zlib_project_file(self, name):
-    if not self.zlib_path:
+    if not self._libraries['zlib'].is_src:
       return
     zlib_path = os.path.abspath(self.zlib_path)
     zlib_sources = map(lambda x : os.path.relpath(x, self.projfilesdir),



Mime
View raw message