Make incremental builds run autoconf if property 'configure' is present

1 files changed, 11 insertions, 2 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index d85879c..8b3e2b5 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -22,7 +22,7 @@ from buildbot.steps.shell import Configure,Compile,ShellCommand
 from buildbot.steps.trigger import Trigger
 from buildbot.steps.transfer import FileDownload
 from buildbot.config import BuilderConfig
-from buildbot.status.results import SUCCESS
+from buildbot.status.results import SUCCESS,SKIPPED
 
 tree = None
 repos = {}
@@ -372,7 +372,16 @@ def BuilderList(slaves):
 
       if (not incremental) and (m.get('skip-autogen') != 'true'):
         factory.addStep(Configure(command=['sh', '-c', 'NOCONFIGURE=1 ./autogen.sh'], name='autoreconf', description='autoreconfing', descriptionDone='autoreconf', logEnviron=logEnviron, env=env))
-        factory.addStep(Configure(command=confcmd, logEnviron=logEnviron, env=env)) # logfiles={'log' : 'config.log'}
+        factory.addStep(Configure(command=confcmd, logEnviron=logEnviron, env=env))
+      elif incremental:
+        # incremental builds only run autoconf if property 'configure' is present
+        def force_configure(step):
+            if step.hasProperty("configure"):
+               return True
+            return False
+
+        factory.addStep(Configure(command=['sh', '-c', 'NOCONFIGURE=1 ./autogen.sh'], name='autoreconf', description='autoreconfing', descriptionDone='autoreconf', logEnviron=logEnviron, env=env, doStepIf=force_configure, hideStepIf=lambda results, s: results==SKIPPED))
+        factory.addStep(Configure(command=confcmd, logEnviron=logEnviron, env=env, logfiles={'log' : 'config.log'}, doStepIf=force_configure, hideStepIf=lambda results, s: results==SKIPPED))
 
       factory.addStep(Compile(logEnviron=logEnviron, env=env))