Changeset 51260 in webkit

Timestamp:

Nov 20, 2009 2:52:47 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-11-20 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.
Reviewed by Eric Seidel.

BuildQueue should check if the tree is currently buildable
​https://bugs.webkit.org/show_bug.cgi?id=31744

• Scripts/bugzilla-tool:
• Scripts/modules/landingsequence.py:
• Scripts/modules/webkitlandingscripts.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (2 diffs)
• Scripts/modules/landingsequence.py (modified) (1 diff)
• Scripts/modules/webkitlandingscripts.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-20  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+        Reviewed by Eric Seidel.
+
+        BuildQueue should check if the tree is currently buildable
+        https://bugs.webkit.org/show_bug.cgi?id=31744
+
+        * Scripts/bugzilla-tool:
+        * Scripts/modules/landingsequence.py:
+        * Scripts/modules/webkitlandingscripts.py:
+
 2009-11-20  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -134 +134 @@
 
 
+class BuildSequence(ConditionalLandingSequence):
+    def __init__(self, options, tool):
+        ConditionalLandingSequence.__init__(self, None, options, tool)
+
+    def run(self):
+        self.clean()
+        self.update()
+        self.build()
+
+
+class Build(Command):
+    name = "build"
+    def __init__(self):
+        options = WebKitLandingScripts.cleaning_options()
+        options += WebKitLandingScripts.build_options()
+        options += WebKitLandingScripts.land_options()
+        Command.__init__(self, "Updates working copy and does a build.", "", options)
+
+    def execute(self, options, args, tool):
+        sequence = BuildSequence(options, tool)
+        sequence.run_and_handle_errors()
+
+
 class ApplyAttachment(Command):
     name = "apply-attachment"
@@ -764 +787 @@
 
     def should_proceed_with_work_item(self, patch):
-        # FIXME: We should check whether we're currently able to build!
+        try:
+            self.run_bugzilla_tool(["build", self.port.flag(), "--force-clean", "--quiet"])
+        except ScriptError, e:
+            return (False, "Unable to perform a build.", None)
         return (True, "Building patch %s on bug %s." % (patch["id"], patch["bug_id"]), patch["bug_id"])
 
     def process_work_item(self, patch):
-        self.run_bugzilla_tool(["build-attachment", self.port.flag(), "--force-clean", patch["id"]])
+        self.run_bugzilla_tool(["build-attachment", self.port.flag(), "--force-clean", "--quiet", "--no-update", patch["id"]])
 
 

trunk/WebKitTools/Scripts/modules/landingsequence.py

@@ -112 +112 @@
         LandingSequence.__init__(self, patch, options, tool)
 
+    def update(self):
+        if self._options.update:
+            LandingSequence.update(self)
+
     def build(self):
         if self._options.build:

trunk/WebKitTools/Scripts/modules/webkitlandingscripts.py

@@ -37 +37 @@
 
 from modules.changelogs import ChangeLog
-from modules.logging import log, tee
+from modules.logging import error, log, tee
 from modules.scm import CommitMessage, detect_scm_system, ScriptError, CheckoutNeedsUpdate
 from modules.webkitport import WebKitPort
@@ -79 +79 @@
     def land_options():
         return [
-            make_option("--no-close", action="store_false", dest="close_bug", default=True, help="Leave bug open after landing."),
+            make_option("--no-update", action="store_false", dest="update", default=True, help="Don't update the working directory."),
             make_option("--no-build", action="store_false", dest="build", default=True, help="Commit without building first, implies --no-test."),
             make_option("--no-test", action="store_false", dest="test", default=True, help="Commit without running run-webkit-tests."),
+            make_option("--no-close", action="store_false", dest="close_bug", default=True, help="Leave bug open after landing."),
         ]