jhbuild r2210 - in trunk: . jhbuild jhbuild/modtypes

[fpeters svn gnome org]

Author: fpeters
Date: Wed Aug 13 14:02:04 2008
New Revision: 2210
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2210&view=rev

Log:
* jhbuild/config.py, jhbuild/defaults.jhbuildrc,
jhbuild/modtypes/autotools.py, jhbuild/modtypes/waf.py: added a new
'forcecheck' option, so make check is run even when build is skipped;
also synced code in waf.py.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/config.py
   trunk/jhbuild/modtypes/autotools.py
   trunk/jhbuild/modtypes/waf.py

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Wed Aug 13 14:02:04 2008
@@ -41,7 +41,7 @@
                 'makedistcheck', 'nonotify', 'cvs_program',
                 'checkout_mode', 'copy_dir', 'module_checkout_mode',
                 'build_policy', 'trycheckout', 'min_time',
-                'nopoison', 'makecheck_advisory',
+                'nopoison', 'forcecheck', 'makecheck_advisory',
                 'quiet_mode', 'progress_bar', 'module_extra_env']
 
 env_prepends = {}

Modified: trunk/jhbuild/modtypes/autotools.py
==============================================================================
--- trunk/jhbuild/modtypes/autotools.py	(original)
+++ trunk/jhbuild/modtypes/autotools.py	Wed Aug 13 14:02:04 2008
@@ -204,10 +204,13 @@
             STATE_FORCE_CLEAN, STATE_FORCE_DISTCLEAN]
 
     def skip_check(self, buildscript, last_state):
-        return (not buildscript.config.makecheck or
-                (buildscript.config.module_makecheck.has_key(self.name) and
-                 not buildscript.config.module_makecheck[self.name]) or
-                buildscript.config.nobuild)
+        if not buildscript.config.module_makecheck.get(self.name, buildscript.config.makecheck):
+            return True
+        if buildscript.config.forcecheck:
+            return False
+        if buildscript.config.nobuild:
+            return True
+        return False
 
     def do_check(self, buildscript):
         buildscript.set_action(_('Checking'), self)

Modified: trunk/jhbuild/modtypes/waf.py
==============================================================================
--- trunk/jhbuild/modtypes/waf.py	(original)
+++ trunk/jhbuild/modtypes/waf.py	Wed Aug 13 14:02:04 2008
@@ -133,8 +133,13 @@
     do_build.error_states = [STATE_FORCE_CHECKOUT, STATE_CONFIGURE]
 
     def skip_check(self, buildscript, last_state):
-        return (not buildscript.config.makecheck or
-                buildscript.config.nobuild)
+        if not buildscript.config.module_makecheck.get(self.name, buildscript.config.makecheck):
+            return True
+        if buildscript.config.forcecheck:
+            return False
+        if buildscript.config.nobuild:
+            return True
+        return False
 
     def do_check(self, buildscript):
         buildscript.set_action(_('Checking'), self)