Ticket #52742: variants-master.cfg.diff

File variants-master.cfg.diff, 2.4 KB (added by mojca (Mojca Miklavec), 4 years ago)

patches for master.cfg that add support for building with arbitrary variants (no sanity checking yet!)

  • master.cfg

     
    218218    schedulers.ForceScheduler(
    219219        name='portwatcher_force',
    220220        builderNames=portwatcher_buildernames,
    221         properties=[util.StringParameter(
    222             name='portlist',
    223             label='Port list:',
    224             default='',
    225             size=30,
    226             required=True)])
     221        properties=[
     222            util.StringParameter(
     223                name='portlist',
     224                label='Port list:',
     225                default='',
     226                size=30,
     227                required=True),
     228            util.StringParameter(
     229                name='variants',
     230                label='Variants:',
     231                default='',
     232                size=30,
     233                required=False)])
    227234    ]
    228235
    229236
     
    353360            for port in self.build.getProperty('subportlist').split():
    354361                props = self.set_properties.copy()
    355362                props['portname'] = port
     363                props['variants'] = self.build.getProperty('variants')
    356364                sp.append([scheduler, props])
    357365        return sp
    358366
     
    441449logdir = os.path.join(portbuilder_factory.workdir, 'logs')
    442450
    443451portbuilder_factory.addStep(steps.Compile(
    444     command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-dependencies', util.WithProperties('%(portname)s')],
     452    command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-dependencies', util.WithProperties('%(portname)s'), '--variants', util.WithProperties('%(variants)s')],
    445453    name='install-dependencies',
    446454    description=['installing', 'dependencies', 'of', util.WithProperties('%(portname)s')],
    447455    descriptionDone=['install', 'dependencies', 'of', util.WithProperties('%(portname)s')],
     
    449457    haltOnFailure=True))
    450458
    451459portbuilder_factory.addStep(steps.Compile(
    452     command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-port', util.WithProperties('%(portname)s')],
     460    command=['./mpbb/mpbb', '--prefix', util.WithProperties(prefix), 'install-port', util.WithProperties('%(portname)s'), '--variants', util.WithProperties('%(variants)s')],
    453461    name='install-port',
    454462    description=['installing', util.WithProperties('%(portname)s')],
    455463    descriptionDone=['install', util.WithProperties('%(portname)s')],