Changeset 51729 in webkit

Timestamp:

Dec 5, 2009 1:54:39 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

Move update-webkit into BuildSteps
​https://bugs.webkit.org/show_bug.cgi?id=32181

We need to move update-webkit out of SCM.py because SCM isn't supposed to know
that WebKit exists. The proper place for the knowledge of the existence of
update-webkit is in WebKitPort because some ports have specialized update
scripts (analogous to build-webkit).

• Scripts/modules/buildsteps.py:
• Scripts/modules/commands/download.py:
• Scripts/modules/landingsequence.py:
• Scripts/modules/scm.py:
• Scripts/modules/webkitport.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/buildsteps.py (modified) (1 diff)
• Scripts/modules/commands/download.py (modified) (2 diffs)
• Scripts/modules/landingsequence.py (modified) (1 diff)
• Scripts/modules/scm.py (modified) (3 diffs)
• Scripts/modules/webkitport.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-05  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Move update-webkit into BuildSteps
+        https://bugs.webkit.org/show_bug.cgi?id=32181
+
+        We need to move update-webkit out of SCM.py because SCM isn't supposed to know
+        that WebKit exists.  The proper place for the knowledge of the existence of
+        update-webkit is in WebKitPort because some ports have specialized update
+        scripts (analogous to build-webkit).
+
+        * Scripts/modules/buildsteps.py:
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/landingsequence.py:
+        * Scripts/modules/scm.py:
+        * Scripts/modules/webkitport.py:
+
 2009-12-05  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/modules/buildsteps.py

@@ -77 +77 @@
             scm.ensure_clean_working_directory(force_clean=options.force_clean)
 
+    def update(self, port=WebKitPort):
+        log("Updating working directory")
+        run_and_throw_if_fail(port.update_webkit_command())
+
     def run_tests(self, launch_safari, fail_fast=False, quiet=False, port=WebKitPort):
         args = port.run_webkit_tests_command()

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

@@ -110 +110 @@
         tool.steps.clean_working_directory(tool.scm(), options, allow_local_commits=True)
         if options.update:
-            tool.scm().update_webkit()
+            tool.steps.update()
 
     @staticmethod
@@ -387 +387 @@
 
         tool.steps.clean_working_directory(tool.scm(), options)
-        tool.scm().update_webkit()
+        tool.steps.update()
         tool.scm().apply_reverse_diff(revision)
         self._create_changelogs_for_revert(tool, revision)

trunk/WebKitTools/Scripts/modules/landingsequence.py

@@ -78 +78 @@
 
     def update(self):
-        self._tool.scm().update_webkit()
+        self._tool.steps.update()
 
     def apply_patch(self):

trunk/WebKitTools/Scripts/modules/scm.py

@@ -252 +252 @@
         raise NotImplementedError, "subclasses must implement"
 
-    def update_webkit(self):
-        raise NotImplementedError, "subclasses must implement"
-
     def status_command(self):
         raise NotImplementedError, "subclasses must implement"
@@ -363 +360 @@
         self.run_command(['svn', 'revert', '-R', '.'])
 
-    def update_webkit(self):
-        self.run_command(self.script_path("update-webkit"))
-
     def status_command(self):
         return ['svn', 'status']
@@ -458 +452 @@
         if self.rebase_in_progress():
             self.run_command(['git', 'rebase', '--abort'])
-
-    def update_webkit(self):
-        # FIXME: Call update-webkit once https://bugs.webkit.org/show_bug.cgi?id=27162 is fixed.
-        log("Updating working directory")
-        self.run_command(['git', 'svn', 'rebase'])
 
     def status_command(self):

trunk/WebKitTools/Scripts/modules/webkitport.py

@@ -63 +63 @@
 
     @classmethod
-    def run_webkit_tests_command(cls):
-        return [cls.script_path("run-webkit-tests")]
+    def update_webkit_command(cls):
+        return [cls.script_path("update-webkit")]
 
     @classmethod
     def build_webkit_command(cls):
         return [cls.script_path("build-webkit")]
+
+    @classmethod
+    def run_webkit_tests_command(cls):
+        return [cls.script_path("run-webkit-tests")]