Make force configure property appear on force build form

1 files changed, 17 insertions, 10 deletions

diff --git a/modulesetparser.py b/modulesetparser.py
index 1b12924..79c7945 100755
--- a/modulesetparser.py
+++ b/modulesetparser.py
@@ -176,6 +176,9 @@ def get_repo(b):
 
   return repo
 
+def is_incremental(name):
+  return name in [ 'mesa-mesa', 'xserver', 'xserver-meson' ]
+
 def ChangeSourceList():
   parse()
 
@@ -251,9 +254,17 @@ def SchedulerList():
                                         repository=repo_url,
                                         branch='master',
                                         revision='')
+
+      custom_properties = []
+      if is_incremental(m.get('id')):
+        custom_properties += [util.BooleanParameter(name="configure",
+                                                    label="run configuration step",
+                                                    default=False)]
+
       result.append(ForceScheduler(name='force-' + m.get('id'),
                                  codebases=[codebase],
-                                 builderNames=[m.get('id')]))
+                                 builderNames=[m.get('id')],
+                                 properties=custom_properties))
 
     # a scheduler to trigger building the module when a dependency is rebuilt
 #    result.append(Triggerable(name='triggerable-' + m.get('id'),
@@ -289,10 +300,7 @@ def BuilderList(workers):
     else:
       tags = ['misc']
 
-    if name in [ 'mesa-mesa', 'xserver', 'xserver-meson' ]:
-      incremental = True
-    else:
-      incremental = False
+    incremental = is_incremental(name)
 
     # log environment if the logEnviron property is present ?
 #    logEnviron = Interpolate('%(prop:logEnviron:-False)s')
@@ -325,6 +333,7 @@ def BuilderList(workers):
       env['MAKEFLAGS'] = '-j4' # should depend on 'nproc' run on buildworker?
       env['PATH'] = Interpolate(os.path.join(prefix, 'bin') + ':${PATH}')
       env['PREFIX'] = Interpolate(prefix)
+      env['PYTHONUNBUFFERED'] = '1'  # make meson output appear while it's running
 
       if name == 'libpixman':
         # pixman tests run slower when OpenMP is allowed to use multiple threads. I'm assuming this is a toolchain bug...
@@ -340,7 +349,7 @@ def BuilderList(workers):
                       'xf86-video-dummy' : '--disable-dga', # config check needs fixing to default to auto, not yes
                       'xts'              : '--disable-shared',
                       'fontconfig'       : '--with-default-fonts=' + os.path.join(prefix, 'share', 'fonts'),
-                      'xserver-meson'    : '-Dudev=false -Dpciaccess=false -Dint10=false -Dsystemd_logind=false -Ddmx=true -Dxephyr=true -Dglamor=false -Ddefault_font_path=catalogue:/etc/X11/fontpath.d,built-ins -Dxkb_default_rules=base',
+                      'xserver-meson'    : '-Dudev=false -Dudev_kms=false -Dpciaccess=false -Dint10=false -Dsystemd_logind=false -Ddmx=true -Dxephyr=true -Dglamor=false -Ddefault_font_path=catalogue:/etc/X11/fontpath.d,built-ins -Dxkb_default_rules=base',
                       'mesa-mesa'  : '-Degl=false -Dbuild-tests=true',
                     }
 
@@ -377,11 +386,9 @@ def BuilderList(workers):
         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
+      # incremental builds only configure if property 'configure' is present and True
       def force_configure(step):
-        if step.hasProperty("configure"):
-          return True
-        return False
+        return step.getProperty("configure", False)
 
       if m.tag == 'autotools':