Changeset 51893 in webkit

Timestamp:

Dec 9, 2009 1:24:40 AM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

[bzt] Convert Build to use Sequence
​https://bugs.webkit.org/show_bug.cgi?id=32310

So much prettier.

• Scripts/modules/buildsteps.py:
• Scripts/modules/commands/download.py:
• Scripts/modules/landingsequence.py:
• Scripts/modules/stepsequence.py: Added.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/buildsteps.py (modified) (7 diffs)
• Scripts/modules/commands/download.py (modified) (3 diffs)
• Scripts/modules/landingsequence.py (modified) (1 diff)
• Scripts/modules/stepsequence.py (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-09  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Convert Build to use Sequence
+        https://bugs.webkit.org/show_bug.cgi?id=32310
+
+        So much prettier.
+
+        * Scripts/modules/buildsteps.py:
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/landingsequence.py:
+        * Scripts/modules/stepsequence.py: Added.
+
 2009-12-09  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/modules/buildsteps.py

@@ -51 +51 @@
 
 class AbstractStep(object):
-    def __init__(self, tool, options):
+    def __init__(self, tool, options, patch=None):
         self._tool = tool
         self._options = options
+        self._patch = patch
         self._port = None
 
@@ -75 +76 @@
 
 
-class AbstractPatchStep(AbstractStep):
-    def __init__(self, tool, options, patch):
-        AbstractStep.__init__(self, tool, options)
-        self._patch = patch
-
-
 class PrepareChangelogStep(AbstractStep):
     def run(self):
@@ -87 +82 @@
 
 class CleanWorkingDirectoryStep(AbstractStep):
-    def __init__(self, tool, options, allow_local_commits=False):
-        AbstractStep.__init__(self, tool, options)
+    def __init__(self, tool, options, patch=None, allow_local_commits=False):
+        AbstractStep.__init__(self, tool, options, patch)
         self._allow_local_commits = allow_local_commits
 
@@ -99 +94 @@
 
     def run(self):
-        os.chdir(self._tool._scm.checkout_root)
+        os.chdir(self._tool.scm().checkout_root)
         if not self._allow_local_commits:
             self._tool.scm().ensure_no_local_commits(self._options.force_clean)
@@ -121 +116 @@
 
 
-class ApplyPatchStep(AbstractPatchStep):
+class ApplyPatchStep(AbstractStep):
     @classmethod
     def options(cls):
@@ -198 +193 @@
 
 
-class ClosePatchStep(AbstractPatchStep):
+class ClosePatchStep(AbstractStep):
     def run(self, commit_log):
         comment_text = bug_comment_from_commit_text(self._tool.scm(), commit_log)
@@ -204 +199 @@
 
 
-class CloseBugStep(AbstractPatchStep):
+class CloseBugStep(AbstractStep):
     @classmethod
     def options(cls):

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

@@ -34 +34 @@
 
 from modules.bugzilla import parse_bug_id
-from modules.buildsteps import BuildSteps, EnsureBuildersAreGreenStep, CleanWorkingDirectoryStep, UpdateStep, CheckStyleStep, PrepareChangelogStep, CleanWorkingDirectoryStep
+from modules.buildsteps import BuildSteps, EnsureBuildersAreGreenStep, CleanWorkingDirectoryStep, UpdateStep, BuildStep, CheckStyleStep, PrepareChangelogStep
 from modules.changelogs import ChangeLog
 from modules.comments import bug_comment_from_commit_text
@@ -42 +42 @@
 from modules.multicommandtool import Command
 from modules.processutils import ScriptError
-
-
-class BuildSequence(LandingSequence):
-    def run(self):
-        self.clean()
-        self.update()
-        self.build()
+from modules.stepsequence import StepSequence
 
 
@@ -55 +49 @@
     show_in_main_help = False
     def __init__(self):
-        options = BuildSteps.cleaning_options()
-        options += BuildSteps.build_options()
-        options += BuildSteps.land_options()
-        Command.__init__(self, "Update working copy and build", "", options)
-
-    def execute(self, options, args, tool):
-        sequence = BuildSequence(None, options, tool)
-        sequence.run_and_handle_errors()
+        self._sequence = StepSequence([
+            CleanWorkingDirectoryStep,
+            UpdateStep,
+            BuildStep
+        ])
+        Command.__init__(self, "Update working copy and build", "", self._sequence.options())
+
+    def execute(self, options, args, tool):
+        self._sequence.run_and_handle_errors(tool, options)
 
 

trunk/WebKitTools/Scripts/modules/landingsequence.py

@@ -43 +43 @@
         raise NotImplementedError, "subclasses must implement"
 
-
+# FIXME: This class is slowing being killed and replaced with StepSequence.
 class LandingSequence:
     def __init__(self, patch, options, tool):