jhbuild r2231 - in trunk: . doc doc/C jhbuild/modtypes modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Thu Aug 14 11:28:33 2008
New Revision: 2231
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2231&view=rev

Log:
* jhbuild/modtypes/autotools.py, modulesets/moduleset.dtd,
modulesets/gnome-external-deps-2.24.modules: added a new check-target
attribute to <autotools> modules; for those that do *not* support
make check (hicolor-icon-theme, sqlite3).



Modified:
   trunk/ChangeLog
   trunk/doc/C/jhbuild.xml
   trunk/doc/ChangeLog
   trunk/jhbuild/modtypes/autotools.py
   trunk/modulesets/gnome-external-deps-2.24.modules
   trunk/modulesets/moduleset.dtd

Modified: trunk/doc/C/jhbuild.xml
==============================================================================
--- trunk/doc/C/jhbuild.xml	(original)
+++ trunk/doc/C/jhbuild.xml	Thu Aug 14 11:28:33 2008
@@ -1946,6 +1946,7 @@
 	      [ makefile="<replaceable>makefile</replaceable>" ]
 	      [ skip-autogen="<replaceable>skip-autogen</replaceable>" ]
 	      [ autogen-template="<replaceable>autogen-template</replaceable>" ]
+	      [ check-target="<replaceable>check-target</replaceable>" ]
 	      [ supports-non-srcdir-builds="<replaceable>supports-non-srcdir-builds</replaceable>" ]&gt;
 
   &lt;branch [ ... ] &gt;
@@ -2002,6 +2003,10 @@
 %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s
 </programlisting>
 
+	<para>The <sgmltag class="attribute">check-target</sgmltag> attribute
+	must be specified (with false as value) for modules that do not have
+	a <command>make check</command> target.</para>
+
       </section>
 
       <section id="moduleset-syntax-defs-cmake">

Modified: trunk/jhbuild/modtypes/autotools.py
==============================================================================
--- trunk/jhbuild/modtypes/autotools.py	(original)
+++ trunk/jhbuild/modtypes/autotools.py	Thu Aug 14 11:28:33 2008
@@ -54,7 +54,8 @@
                  autogen_sh='autogen.sh',
                  makefile='Makefile',
                  extra_env = None,
-                 autogen_template=None):
+                 autogen_template=None,
+                 check_target=True):
         Package.__init__(self, name, dependencies, after, suggests, extra_env)
         self.branch = branch
         self.autogenargs = autogenargs
@@ -65,6 +66,7 @@
         self.autogen_sh = autogen_sh
         self.makefile = makefile
         self.autogen_template = autogen_template
+        self.check_target = check_target
 
     def get_srcdir(self, buildscript):
         return self.branch.srcdir
@@ -204,6 +206,8 @@
             STATE_FORCE_CLEAN, STATE_FORCE_DISTCLEAN]
 
     def skip_check(self, buildscript, last_state):
+        if not self.check_target:
+            return True
         if not buildscript.config.module_makecheck.get(self.name, buildscript.config.makecheck):
             return True
         if buildscript.config.forcecheck:
@@ -282,6 +286,7 @@
     supports_non_srcdir_builds = True
     autogen_sh = 'autogen.sh'
     skip_autogen = False
+    check_target = True
     makefile = 'Makefile'
     autogen_template = None
     if node.hasAttribute('autogenargs'):
@@ -295,6 +300,8 @@
             (node.getAttribute('supports-non-srcdir-builds') != 'no')
     if node.hasAttribute('skip-autogen'):
         skip_autogen = (node.getAttribute('skip-autogen') == 'true')
+    if node.hasAttribute('check-target'):
+        check_target = (node.getAttribute('check-target') == 'true')
     if node.hasAttribute('autogen-sh'):
         autogen_sh = node.getAttribute('autogen-sh')
     if node.hasAttribute('makefile'):
@@ -335,7 +342,8 @@
                          autogen_sh=autogen_sh,
                          makefile=makefile,
                          extra_env=extra_env,
-                         autogen_template=autogen_template)
+                         autogen_template=autogen_template,
+                         check_target=check_target)
 register_module_type('autotools', parse_autotools)
 
 

Modified: trunk/modulesets/gnome-external-deps-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.24.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.24.modules	Thu Aug 14 11:28:33 2008
@@ -133,7 +133,8 @@
     </dependencies>
   </tarball>
 
-  <tarball id="hicolor-icon-theme" version="0.10" supports-non-srcdir-builds="no" >
+  <tarball id="hicolor-icon-theme" version="0.10" supports-non-srcdir-builds="no"
+	  check-target="false">
     <source href="http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.10.tar.gz";
             md5sum="3534f7b8e59785c7d5bfa923e85510a7" size="33616"/>
   </tarball>
@@ -397,7 +398,8 @@
       href="http://www.kernel.org/pub/linux/"/>
   <autotools id="libvolume_id" skip-autogen="true"
                  makeargs="EXTRAS=extras/volume_id prefix=${prefix} libdir=${libdir}"
-                 makeinstallargs="-C extras/volume_id prefix=${prefix} libdir=${libdir} install-bin install-man">
+		 makeinstallargs="-C extras/volume_id prefix=${prefix} libdir=${libdir} install-bin install-man"
+		 check_target="false">
     <branch repo="kernel.org"
 	    module="utils/kernel/hotplug/udev-111.tar.bz2" version="111"
 	    size="190020" md5sum="bd2a94e3ed243e6a3d501a5c8afc4b54">
@@ -477,7 +479,7 @@
   </autotools>
 
   <autotools id="sqlite3" autogen-sh="configure"  
-	     autogenargs="--enable-threadsafe">
+	     autogenargs="--enable-threadsafe" check-target="false">
     <branch module="sqlite-3.5.9.tar.gz" version="3.5.9"
 	    repo="sqlite.org"
 	    md5sum="b58412904b42fe49e5a281e99da0fd72" size="2201083">

Modified: trunk/modulesets/moduleset.dtd
==============================================================================
--- trunk/modulesets/moduleset.dtd	(original)
+++ trunk/modulesets/moduleset.dtd	Thu Aug 14 11:28:33 2008
@@ -35,7 +35,8 @@
 	makefile	CDATA	#IMPLIED
 	skip-autogen	(true|false) "false"
 	supports-non-srcdir-builds (yes|no) "yes"
-	autogen-template CDATA  #IMPLIED>
+	autogen-template CDATA  #IMPLIED
+	check-target	(true|false) "true">
 
 <!ELEMENT waf (branch,dependencies?,suggests?,after?)>
 <!-- Note: Here the ID type is not used as some existing IDs in modsets are not