Changeset 91782 in webkit


Ignore:
Timestamp:
Jul 26, 2011 2:17:14 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

CSS Regions build bot should build with "--css-regions" and "--css-exclusion" flags
https://bugs.webkit.org/show_bug.cgi?id=65171

Added "features" parameter in config.json for "builder" objects. The parameter is optional and must be an array. All the items
of the array will be passed to the build-webkit script. The items will automatically be prefixed with "--".

Patch by Alexandru Chiculita <Alexandru Chiculita> on 2011-07-26
Reviewed by Adam Roben.

  • BuildSlaveSupport/build.webkit.org-config/config.json:
  • BuildSlaveSupport/build.webkit.org-config/master.cfg:
Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

    r91671 r91782  
    244244                    },
    245245                    { "name": "CSSRegions SnowLeopard Intel Release (Build)", "type": "Build", "builddir": "cssregions-snowleopard-intel-release",
    246                       "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"],
     246                      "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"], "features": ["css-regions", "css-exclusions"],
    247247                      "slavenames": ["adobe-mac-slave1"]
    248248                    }
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

    r91516 r91782  
    3030    description = ["configuring build"]
    3131    descriptionDone = ["configured build"]
    32     def __init__(self, platform, configuration, architecture, buildOnly, *args, **kwargs):
     32    def __init__(self, platform, configuration, architecture, buildOnly, features, *args, **kwargs):
    3333        buildstep.BuildStep.__init__(self, *args, **kwargs)
    3434        self.platform = platform.split('-', 1)[0]
     
    3737        self.architecture = architecture
    3838        self.buildOnly = buildOnly
    39         self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly)
     39        self.features = features;
     40        self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly, features=features)
    4041
    4142    def start(self):
     
    4546        self.setProperty("architecture", self.architecture)
    4647        self.setProperty("buildOnly", self.buildOnly)
     48        self.setProperty("features", self.features)
    4749        self.finished(SUCCESS)
    4850        return defer.succeed(None)
     
    102104
    103105        appendCustomBuildFlags(self, platform)
     106
     107        features = self.getProperty('features')
     108        for feature in features:
     109            self.setCommand(self.command + ['--' + feature])
     110
    104111        return shell.Compile.start(self)
    105112
     
    585592
    586593class Factory(factory.BuildFactory):
    587     def __init__(self, platform, configuration, architectures, buildOnly):
     594    def __init__(self, platform, configuration, architectures, buildOnly, features=None):
    588595        factory.BuildFactory.__init__(self)
    589         self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly)
     596        self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, features=features)
    590597        self.addStep(CheckOutSource)
    591598        if platform in ("win", "chromium-win"):
     
    597604
    598605class BuildFactory(Factory):
    599     def __init__(self, platform, configuration, architectures, triggers=None):
    600         Factory.__init__(self, platform, configuration, architectures, True)
     606    def __init__(self, platform, configuration, architectures, triggers=None, **kwargs):
     607        Factory.__init__(self, platform, configuration, architectures, True, **kwargs)
    601608        self.addStep(CompileWebKit)
    602609        if triggers:
     
    612619    TestClass = RunWebKitTests
    613620    ExtractTestResultsClass = ExtractTestResults
    614     def __init__(self, platform, configuration, architectures):
    615         Factory.__init__(self, platform, configuration, architectures, False)
     621    def __init__(self, platform, configuration, architectures, **kwargs):
     622        Factory.__init__(self, platform, configuration, architectures, False, **kwargs)
    616623        if platform == "mac-leopard":
    617624            # Work around an ATSServer leak. See <http://webkit.org/b/51807>.
     
    635642    TestClass = RunWebKitTests
    636643    ExtractTestResultsClass = ExtractTestResults
    637     def __init__(self, platform, configuration, architectures):
    638         Factory.__init__(self, platform, configuration, architectures, False)
     644    def __init__(self, platform, configuration, architectures, **kwargs):
     645        Factory.__init__(self, platform, configuration, architectures, False, **kwargs)
    639646        if platform.startswith("chromium"):
    640647            self.addStep(CleanupChromiumCrashLogs)
     
    718725                factoryArgs.append(value)
    719726
    720         builder["factory"] = factory(*factoryArgs)
     727        factoryKwArgs = {
     728            "features": builder.pop("features", [])
     729        }
     730
     731        builder["factory"] = factory(*factoryArgs, **factoryKwArgs)
    721732
    722733        builder["category"] = "noncore"
  • trunk/Tools/ChangeLog

    r91779 r91782  
     12011-07-26  Alexandru Chiculita  <achicu@adobe.com>
     2
     3        CSS Regions build bot should build with "--css-regions" and "--css-exclusion" flags
     4        https://bugs.webkit.org/show_bug.cgi?id=65171
     5
     6        Added "features" parameter in config.json for "builder" objects. The parameter is optional and must be an array. All the items
     7        of the array will be passed to the build-webkit script. The items will automatically be prefixed with "--".
     8
     9        Reviewed by Adam Roben.
     10
     11        * BuildSlaveSupport/build.webkit.org-config/config.json:
     12        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
     13
    1142011-07-26  Chris Rogers  <crogers@google.com>
    215
Note: See TracChangeset for help on using the changeset viewer.