Fix force re-configuring of incremental build meson modules

1 files changed, 7 insertions, 6 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 31992ff..9144a55 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -364,18 +364,18 @@ def BuilderList(slaves):
         factory.addStep(ShellCommand(command=['sh', '-c', 'patch -p1 <' + p], name='patch', description='patching', descriptionDone='patch', logEnviron=logEnviron, haltOnFailure=False, flunkOnFailure=False))
         factory.addStep(ShellCommand(command=['sh', '-c', 'rm ' + p], name='tidy', description='tidying', descriptionDone='tidy', hideStepIf=lambda r,s: r == SUCCESS, haltOnFailure=False, flunkOnFailure=False))
 
+      # incremental builds only configure if property 'configure' is present
+      def force_configure(step):
+        if step.hasProperty("configure"):
+          return True
+        return False
+
       if m.tag == 'autotools':
 
         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))
         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))
 
@@ -391,6 +391,7 @@ def BuilderList(slaves):
         if not incremental:
             factory.addStep(Configure(command=['meson', '--prefix', Interpolate(prefix), 'build'] + extra, name='meson', description='meson', descriptionDone='meson', logEnviron=logEnviron, env=env))
         else:
+            factory.addStep(Configure(command=['rm', '-rf', 'build'], name='wipe', description='wipe', descriptionDone='wipe', logEnviron=logEnviron, env=env, doStepIf=force_configure, hideStepIf=lambda results, s: results==SKIPPED))
             factory.addStep(Configure(command=['meson', '--prefix', Interpolate(prefix), 'build'] + extra, name='meson', description='meson', descriptionDone='meson', logEnviron=logEnviron, env=env, doStepIf=force_configure, hideStepIf=lambda results, s: results==SKIPPED))
 
         factory.addStep(Compile(command=['ninja', '-C', 'build'], logEnviron=logEnviron, env=env))