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

[rh...@apache.org]

Author: rhuijben
Date: Tue Sep 17 13:05:55 2013
New Revision: 1524029

URL: http://svn.apache.org/r1524029
Log:
Properly handle the 'when' option in build.conf on Windows. This filters
a few projects that currently can't be build on Windows.

* build/generator/gen_win.py
  (get_install_targets): Filter projects that are disabled.

* build/generator/gen_win_dependencies.py
  (_windows_when): New variable.

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=1524029&r1=1524028&r2=1524029&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue Sep 17 13:05:55 2013
@@ -198,6 +198,9 @@ class WinGeneratorBase(gen_win_dependenc
     install_targets = self.graph.get_all_sources(gen_base.DT_INSTALL) \
                       + self.projects
 
+    install_targets = [x for x in install_targets if not x.when or
+                                                     x.when in self._windows_when]
+
     # Don't create projects for scripts
     install_targets = [x for x in install_targets if not isinstance(x, gen_base.TargetScript)]
 

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1524029&r1=1524028&r2=1524029&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Tue Sep 17 13:05:55 2013
@@ -123,6 +123,13 @@ class GenDependenciesBase(gen_base.Gener
         'magic',
   ]
 
+  # When build.conf contains a 'when = SOMETHING' where SOMETHING is not in
+  # this list, then the project is not generated on Windows.
+  _windows_when = [
+     'INSTALL_APACHE_MODS',
+     # not 'SVN_USE_GMOCK',
+  ]
+
   def parse_options(self, options):
     self.apr_path = 'apr'
     self.apr_util_path = 'apr-util'