Changeset 51434 in webkit

Timestamp:

Nov 26, 2009 11:56:24 PM (14 years ago)

Author:

abarth@webkit.org

Message:

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

Reviewed by Eric Seidel.

[bzt] Kill WebKitLandingScripts
​https://bugs.webkit.org/show_bug.cgi?id=31904

Step 4: Kill run_webkit_script.

• Scripts/modules/buildsteps.py:
• Scripts/modules/commands/download.py:
• Scripts/modules/webkitlandingscripts.py:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-26  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Kill WebKitLandingScripts
+        https://bugs.webkit.org/show_bug.cgi?id=31904
+
+        Step 4: Kill run_webkit_script.
+
+        * Scripts/modules/buildsteps.py:
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/webkitlandingscripts.py:
+
 2009-11-26  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/modules/buildsteps.py

@@ -29 +29 @@
 import os
 
-from modules.logging import error
+from modules.logging import log, error
 from modules.webkitlandingscripts import WebKitLandingScripts
 from modules.webkitport import WebKitPort
 
 class BuildSteps:
+    def _run_script(cls, script_name, quiet=False, port=WebKitPort):
+        log("Running %s" % script_name)
+        WebKitLandingScripts.run_and_throw_if_fail(port.script_path(script_name), quiet)
+
+    def prepare_changelog(self):
+        self.run_script("prepare-ChangeLog")
+
     def clean_working_directory(self, scm, options, allow_local_commits=False):
         os.chdir(scm.checkout_root)
@@ -59 +66 @@
         log("Building WebKit")
         WebKitLandingScripts.run_and_throw_if_fail(port.build_webkit_command(), quiet)
+
+    def check_style(self):
+        self._run_script("check-webkit-style")
+

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

@@ -255 +255 @@
     def build(self):
         # Instead of building, we check style.
-        WebKitLandingScripts.run_webkit_script("check-webkit-style")
+        self._tool.steps.check_style()
 
 
@@ -360 +360 @@
 
     @staticmethod
-    def _create_changelogs_for_revert(scm, revision):
+    def _create_changelogs_for_revert(tool, revision):
         # First, discard the ChangeLog changes from the rollout.
-        changelog_paths = scm.modified_changelogs()
-        scm.revert_files(changelog_paths)
+        changelog_paths = tool.scm().modified_changelogs()
+        tool.scm().revert_files(changelog_paths)
 
         # Second, make new ChangeLog entries for this rollout.
         # This could move to prepare-ChangeLog by adding a --revert= option.
-        WebKitLandingScripts.run_webkit_script("prepare-ChangeLog")
+        tool.steps.prepare_changelog()
         for changelog_path in changelog_paths:
             ChangeLog(changelog_path).update_for_revert(revision)
@@ -396 +396 @@
         tool.scm().update_webkit()
         tool.scm().apply_reverse_diff(revision)
-        self._create_changelogs_for_revert(tool.scm(), revision)
+        self._create_changelogs_for_revert(tool, revision)
 
         # FIXME: Fully automated rollout is not 100% idiot-proof yet, so for now just log with instructions on how to complete the rollout.

trunk/WebKitTools/Scripts/modules/webkitlandingscripts.py

@@ -114 +114 @@
             raise ScriptError(script_args=args, exit_code=exit_code, output=child_output)
 
-    @classmethod
-    def run_webkit_script(cls, script_name, quiet=False, port=WebKitPort):
-        log("Running %s" % script_name)
-        cls.run_and_throw_if_fail(port.script_path(script_name), quiet)
 
 
-
-