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

[fpeters svn gnome org]

Author: fpeters
Date: Mon Jan 19 11:55:01 2009
New Revision: 2645
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2645&view=rev

Log:
* jhbuild/modtypes/autotools.py, modulesets/moduleset.dtd,
doc/C/jhbuild.xml: added support for a new skip-autogen value, "never",
so autogen.sh (or configure) is never skipped.  (closes: #566437)



Modified:
   trunk/ChangeLog
   trunk/doc/C/jhbuild.xml
   trunk/jhbuild/modtypes/autotools.py
   trunk/modulesets/moduleset.dtd

Modified: trunk/doc/C/jhbuild.xml
==============================================================================
--- trunk/doc/C/jhbuild.xml	(original)
+++ trunk/doc/C/jhbuild.xml	Mon Jan 19 11:55:01 2009
@@ -2137,7 +2137,9 @@
 	<command>configure</command>.
 
 	<sgmltag class="attribute">skip-autogen</sgmltag> chooses whether
-	or not to run autogen.sh.
+	or not to run autogen.sh, it is a boolean with an extra
+	<literal>never</literal> value to tell JHBuild to never skip running
+	<command>autogen.sh</command>.
 	<sgmltag class="attribute">makefile</sgmltag> specifies the
 	filename of the makefile to use.</para>
 

Modified: trunk/jhbuild/modtypes/autotools.py
==============================================================================
--- trunk/jhbuild/modtypes/autotools.py	(original)
+++ trunk/jhbuild/modtypes/autotools.py	Mon Jan 19 11:55:01 2009
@@ -108,7 +108,7 @@
             return True
 
         # skip if manually instructed to do so
-        if self.skip_autogen:
+        if self.skip_autogen is True:
             return True
 
         # don't skip this stage if we got here from one of the
@@ -119,6 +119,9 @@
                           self.STATE_INSTALL]:
             return False
 
+        if self.skip_autogen == 'never':
+            return False
+
         # skip if the makefile exists and we don't have the
         # alwaysautogen flag turned on:
         builddir = self.get_builddir(buildscript)
@@ -326,7 +329,13 @@
         supports_non_srcdir_builds = \
             (node.getAttribute('supports-non-srcdir-builds') != 'no')
     if node.hasAttribute('skip-autogen'):
-        skip_autogen = (node.getAttribute('skip-autogen') == 'true')
+        skip_autogen = node.getAttribute('skip-autogen')
+        if skip_autogen == 'true':
+            skip_autogen = True
+        elif skip_autogen == 'never':
+            skip_autogen = 'never'
+        else:
+            skip_autogen = False
     if node.hasAttribute('check-target'):
         check_target = (node.getAttribute('check-target') == 'true')
     if node.hasAttribute('autogen-sh'):

Modified: trunk/modulesets/moduleset.dtd
==============================================================================
--- trunk/modulesets/moduleset.dtd	(original)
+++ trunk/modulesets/moduleset.dtd	Mon Jan 19 11:55:01 2009
@@ -40,7 +40,7 @@
 	makeinstallargs CDATA	#IMPLIED
 	autogen-sh	CDATA	#IMPLIED
 	makefile	CDATA	#IMPLIED
-	skip-autogen	(true|false) "false"
+	skip-autogen	(true|false|never) "false"
 	supports-non-srcdir-builds (yes|no) "yes"
 	autogen-template CDATA  #IMPLIED
 	check-target	(true|false) "true">