Changeset 51942 in webkit

Timestamp:

Dec 10, 2009 12:33:26 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-10 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

[bzt] Convert more commands to StepSequences
​https://bugs.webkit.org/show_bug.cgi?id=32362

We should eventually convert all the commands, but I'm starting with
the easy ones.

• Scripts/modules/commands/download.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/commands/download.py (modified) (5 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-10  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Convert more commands to StepSequences
+        https://bugs.webkit.org/show_bug.cgi?id=32362
+
+        We should eventually convert all the commands, but I'm starting with
+        the easy ones.
+
+        * Scripts/modules/commands/download.py:
+
 2009-12-10  Xan Lopez  <xlopez@igalia.com>
 

trunk/WebKitTools/Scripts/modules/commands/download.py

@@ -34 +34 @@
 
 from modules.bugzilla import parse_bug_id
-from modules.buildsteps import CommandOptions, BuildSteps, EnsureBuildersAreGreenStep, CleanWorkingDirectoryStep, UpdateStep, BuildStep, CheckStyleStep, PrepareChangelogStep
+from modules.buildsteps import CommandOptions, BuildSteps, EnsureBuildersAreGreenStep, CleanWorkingDirectoryStep, UpdateStep, ApplyPatchStep, BuildStep, CheckStyleStep, PrepareChangelogStep
 from modules.changelogs import ChangeLog
 from modules.comments import bug_comment_from_commit_text
@@ -225 +225 @@
 
 
-class CheckStyleSequence(LandingSequence):
-    def run(self):
-        self.clean()
-        self.update()
-        self.apply_patch()
-        self.build()
-
-    def build(self):
-        # Instead of building, we check style.
-        step = CheckStyleStep(self._tool, self._options)
-        step.run()
-
-
 class CheckStyle(AbstractPatchProcessingCommand):
     name = "check-style"
     show_in_main_help = False
     def __init__(self):
-        options = BuildSteps.cleaning_options()
-        options += BuildSteps.build_options()
-        options += BuildSteps.land_options()
-        AbstractPatchProcessingCommand.__init__(self, "Run check-webkit-style on the specified attachments", "ATTACHMENT_ID [ATTACHMENT_IDS]", options)
+        self._sequence = StepSequence([
+            CleanWorkingDirectoryStep,
+            UpdateStep,
+            ApplyPatchStep,
+            CheckStyleStep,
+        ])
+        AbstractPatchProcessingCommand.__init__(self, "Run check-webkit-style on the specified attachments", "ATTACHMENT_ID [ATTACHMENT_IDS]", self._sequence.options())
 
     def _fetch_list_of_patches_to_process(self, options, args, tool):
@@ -254 +244 @@
 
     def _process_patch(self, patch, options, args, tool):
-        sequence = CheckStyleSequence(patch, options, tool)
-        sequence.run_and_handle_errors()
-
-
-class BuildAttachmentSequence(LandingSequence):
-    def run(self):
-        self.clean()
-        self.update()
-        self.apply_patch()
-        self.build()
+        self._sequence.run_and_handle_errors(tool, options, patch)
 
 
@@ -270 +251 @@
     show_in_main_help = False
     def __init__(self):
-        options = BuildSteps.cleaning_options()
-        options += BuildSteps.build_options()
-        options += BuildSteps.land_options()
-        AbstractPatchProcessingCommand.__init__(self, "Apply and build patches from bugzilla", "ATTACHMENT_ID [ATTACHMENT_IDS]", options)
+        self._sequence = StepSequence([
+            CleanWorkingDirectoryStep,
+            UpdateStep,
+            ApplyPatchStep,
+            BuildStep,
+        ])
+        AbstractPatchProcessingCommand.__init__(self, "Apply and build patches from bugzilla", "ATTACHMENT_ID [ATTACHMENT_IDS]", self._sequence.options())
 
     def _fetch_list_of_patches_to_process(self, options, args, tool):
@@ -282 +266 @@
 
     def _process_patch(self, patch, options, args, tool):
-        sequence = BuildAttachmentSequence(patch, options, tool)
-        sequence.run_and_handle_errors()
+        self._sequence.run_and_handle_errors(tool, options, patch)