Ticket #52742: variants-master.cfg.diff

master.cfg

@@ -218 +218 @@
     schedulers.ForceScheduler(
         name='portwatcher_force',
         builderNames=portwatcher_buildernames,
-        properties=[util.StringParameter(
-            name='portlist',
-            label='Port list:',
-            default='',
-            size=30,
-            required=True)])
+        properties=[
+            util.StringParameter(
+                name='portlist',
+                label='Port list:',
+                default='',
+                size=30,
+                required=True),
+            util.StringParameter(
+                name='variants',
+                label='Variants:',
+                default='',
+                size=30,
+                required=False)])
     ]
 
 
@@ -353 +360 @@
             for port in self.build.getProperty('subportlist').split():
                 props = self.set_properties.copy()
                 props['portname'] = port
+                props['variants'] = self.build.getProperty('variants')
                 sp.append([scheduler, props])
         return sp
 
@@ -441 +449 @@
 logdir = os.path.join(portbuilder_factory.workdir, 'logs')
 
 portbuilder_factory.addStep(steps.Compile(
-    command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-dependencies', util.WithProperties('%(portname)s')],
+    command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-dependencies', util.WithProperties('%(portname)s'), '--variants', util.WithProperties('%(variants)s')],
     name='install-dependencies',
     description=['installing', 'dependencies', 'of', util.WithProperties('%(portname)s')],
     descriptionDone=['install', 'dependencies', 'of', util.WithProperties('%(portname)s')],
@@ -449 +457 @@
     haltOnFailure=True))
 
 portbuilder_factory.addStep(steps.Compile(
-    command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-port', util.WithProperties('%(portname)s')],
+    command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-port', util.WithProperties('%(portname)s'), '--variants', util.WithProperties('%(variants)s')],
     name='install-port',
     description=['installing', util.WithProperties('%(portname)s')],
     descriptionDone=['install', util.WithProperties('%(portname)s')],