Changeset 91782 in webkit
- Timestamp:
- Jul 26, 2011 2:17:14 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
r91671 r91782 244 244 }, 245 245 { "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"], 247 247 "slavenames": ["adobe-mac-slave1"] 248 248 } -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
r91516 r91782 30 30 description = ["configuring build"] 31 31 descriptionDone = ["configured build"] 32 def __init__(self, platform, configuration, architecture, buildOnly, *args, **kwargs):32 def __init__(self, platform, configuration, architecture, buildOnly, features, *args, **kwargs): 33 33 buildstep.BuildStep.__init__(self, *args, **kwargs) 34 34 self.platform = platform.split('-', 1)[0] … … 37 37 self.architecture = architecture 38 38 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) 40 41 41 42 def start(self): … … 45 46 self.setProperty("architecture", self.architecture) 46 47 self.setProperty("buildOnly", self.buildOnly) 48 self.setProperty("features", self.features) 47 49 self.finished(SUCCESS) 48 50 return defer.succeed(None) … … 102 104 103 105 appendCustomBuildFlags(self, platform) 106 107 features = self.getProperty('features') 108 for feature in features: 109 self.setCommand(self.command + ['--' + feature]) 110 104 111 return shell.Compile.start(self) 105 112 … … 585 592 586 593 class Factory(factory.BuildFactory): 587 def __init__(self, platform, configuration, architectures, buildOnly ):594 def __init__(self, platform, configuration, architectures, buildOnly, features=None): 588 595 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) 590 597 self.addStep(CheckOutSource) 591 598 if platform in ("win", "chromium-win"): … … 597 604 598 605 class 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) 601 608 self.addStep(CompileWebKit) 602 609 if triggers: … … 612 619 TestClass = RunWebKitTests 613 620 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) 616 623 if platform == "mac-leopard": 617 624 # Work around an ATSServer leak. See <http://webkit.org/b/51807>. … … 635 642 TestClass = RunWebKitTests 636 643 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) 639 646 if platform.startswith("chromium"): 640 647 self.addStep(CleanupChromiumCrashLogs) … … 718 725 factoryArgs.append(value) 719 726 720 builder["factory"] = factory(*factoryArgs) 727 factoryKwArgs = { 728 "features": builder.pop("features", []) 729 } 730 731 builder["factory"] = factory(*factoryArgs, **factoryKwArgs) 721 732 722 733 builder["category"] = "noncore" -
trunk/Tools/ChangeLog
r91779 r91782 1 2011-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 1 14 2011-07-26 Chris Rogers <crogers@google.com> 2 15
Note: See TracChangeset
for help on using the changeset viewer.