Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (114880 => 114881)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-04-23 08:49:38 UTC (rev 114880)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-04-23 08:51:11 UTC (rev 114881)
@@ -90,15 +90,14 @@
name = "configure build"
description = ["configuring build"]
descriptionDone = ["configured build"]
- def __init__(self, platform, configuration, architecture, buildOnly, features, *args, **kwargs):
+ def __init__(self, platform, configuration, architecture, buildOnly, *args, **kwargs):
buildstep.BuildStep.__init__(self, *args, **kwargs)
self.platform = platform.split('-', 1)[0]
self.fullPlatform = platform
self.configuration = configuration
self.architecture = architecture
self.buildOnly = buildOnly
- self.features = features;
- self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly, features=features)
+ self.addFactoryArguments(platform=platform, configuration=configuration, architecture=architecture, buildOnly=buildOnly)
def start(self):
self.setProperty("platform", self.platform)
@@ -106,7 +105,6 @@
self.setProperty("configuration", self.configuration)
self.setProperty("architecture", self.architecture)
self.setProperty("buildOnly", self.buildOnly)
- self.setProperty("features", self.features)
self.finished(SUCCESS)
return defer.succeed(None)
@@ -186,10 +184,6 @@
appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
- features = self.getProperty('features')
- for feature in features:
- self.setCommand(self.command + ['--' + feature])
-
return shell.Compile.start(self)
@@ -213,26 +207,13 @@
class UploadBuiltProduct(transfer.FileUpload):
slavesrc = WithProperties("WebKitBuild/%(configuration)s.zip")
- masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s%(extraFeatures)s/%(got_revision)s.zip",
- extraFeatures=lambda properties: UploadBuiltProduct.determineExtraFeatures(properties))
+ masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s%/%(got_revision)s.zip")
haltOnFailure = True
def __init__(self):
transfer.FileUpload.__init__(self, self.slavesrc, self.masterdest, mode=0644)
- @staticmethod
- def determineExtraFeatures(properties):
- if not properties.has_key("features"):
- return ''
- features = properties.getProperty("features")
- if not len(features):
- return ''
- result = '-with-' + '-and-'.join(features)
- # Just to make sure no feature will add invalid chars, we allow only letters here.
- result = re.sub('[^a-zA-Z]', '-', result)
- return result
-
class DownloadBuiltProduct(shell.ShellCommand):
command = ["python", "./Tools/BuildSlaveSupport/download-built-product",
WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"),
@@ -694,9 +675,9 @@
class Factory(factory.BuildFactory):
- def __init__(self, platform, configuration, architectures, buildOnly, features=None, **kwargs):
+ def __init__(self, platform, configuration, architectures, buildOnly):
factory.BuildFactory.__init__(self)
- self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, features=features)
+ self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly)
self.addStep(CheckOutSource)
# There are multiple Qt slaves running on same machines, so buildslaves shouldn't kill the processes of other slaves.
if not platform.startswith("qt"):
@@ -712,13 +693,12 @@
class BuildFactory(Factory):
- def __init__(self, platform, configuration, architectures, triggers=None, upload=False, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, True, **kwargs)
+ def __init__(self, platform, configuration, architectures, triggers=None):
+ Factory.__init__(self, platform, configuration, architectures, True)
self.addStep(CompileWebKit)
- if triggers or upload:
+ if triggers:
self.addStep(ArchiveBuiltProduct)
self.addStep(UploadBuiltProduct)
- if triggers:
self.addStep(trigger.Trigger, schedulerNames=triggers)
def unitTestsSupported(configuration, platform):
@@ -730,8 +710,8 @@
class TestFactory(Factory):
TestClass = RunWebKitTests
ExtractTestResultsClass = ExtractTestResults
- def __init__(self, platform, configuration, architectures, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, **kwargs)
+ def __init__(self, platform, configuration, architectures):
+ Factory.__init__(self, platform, configuration, architectures, False)
if platform.startswith("chromium"):
self.addStep(CleanupChromiumCrashLogs)
self.addStep(DownloadBuiltProduct)
@@ -883,13 +863,8 @@
if value:
factoryArgs.append(value)
- factoryKwArgs = {
- "features": builder.pop("features", []),
- "upload": builder.pop("upload", False)
- }
+ builder["factory"] = factory(*factoryArgs)
- builder["factory"] = factory(*factoryArgs, **factoryKwArgs)
-
if platform.startswith('chromium'):
builder["category"] = 'Chromium'
elif platform.startswith('mac'):
