svn commit: r1505127 - in /subversion/trunk/build/generator: gen_win.py gen_win_dependencies.py

[rh...@apache.org]

Author: rhuijben
Date: Sat Jul 20 12:28:51 2013
New Revision: 1505127

URL: http://svn.apache.org/r1505127
Log:
In the Windows project generator: Move printing the list of found libraries to
the generator code.

* build/generator/gen_win.py
  (__init__): Print sorted list here.

* build/generator/gen_win_dependencies.py
  (find_libraries): Remove printing here, as conceptually this output is not
    a task of the library detection.

Modified:
    subversion/trunk/build/generator/gen_win.py
    subversion/trunk/build/generator/gen_win_dependencies.py

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1505127&r1=1505126&r2=1505127&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Sat Jul 20 12:28:51 2013
@@ -82,6 +82,14 @@ class WinGeneratorBase(gen_win_dependenc
 
     self.find_libraries(True)
 
+    # Print list of identified libraries
+    printed = []
+    for lib in sorted(self._libraries.values(), key = lambda s: s.name):
+      if lib.name in printed:
+        continue 
+      printed.append(lib.name)
+      print('Found %s %s' % (lib.name, lib.version))
+
     if 'db' not in self._libraries:
       print('BDB not found, BDB fs will not be built')
 

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1505127&r1=1505126&r2=1505127&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Sat Jul 20 12:28:51 2013
@@ -289,17 +289,6 @@ class GenDependenciesBase(gen_base.Gener
       # Find the installed Java Development Kit
       self._find_jdk()
 
-      # Find Sqlite
-
-    
-    if show_warnings:
-      printed = []
-      for lib in self._libraries.values():
-        if lib.name in printed:
-          continue 
-        printed.append(lib.name)
-        print('Found %s %s' % (lib.name, lib.version))
-    
   def _find_apr(self):
     "Find the APR library and version"