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 3: Kill build_webkit.

        * Scripts/modules/buildsteps.py:
        * Scripts/modules/landingsequence.py:
        * Scripts/modules/webkitlandingscripts.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7f86d7845ef20f34743c3a6cb886ea6cebf3f8fd..8d4a9a8baa6acdd9731e469b7cdcd90db4bf45f1 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+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 3: Kill build_webkit.
+
+        * Scripts/modules/buildsteps.py:
+        * Scripts/modules/landingsequence.py:
+        * Scripts/modules/webkitlandingscripts.py:
+
 2009-11-26  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/WebKitTools/Scripts/modules/buildsteps.py b/WebKitTools/Scripts/modules/buildsteps.py
index 51f4f1beb6ead0442802c5b6cfa645c462bae82f..9d5052e4d6f70400d85cc3d521698ef10df07470 100644 (file)
--- a/WebKitTools/Scripts/modules/buildsteps.py
+++ b/WebKitTools/Scripts/modules/buildsteps.py
@@ -54,3 +54,7 @@ class BuildSteps:
         if not options.check_builders or buildbot.core_builders_are_green():
             return
         error("Builders at %s are red, please do not commit.  Pass --ignore-builders to bypass this check." % (buildbot.buildbot_host))
+
+    def build_webkit(self, quiet=False, port=WebKitPort):
+        log("Building WebKit")
+        WebKitLandingScripts.run_and_throw_if_fail(port.build_webkit_command(), quiet)

diff --git a/WebKitTools/Scripts/modules/landingsequence.py b/WebKitTools/Scripts/modules/landingsequence.py
index 9a5d453c4bcf64cffb2a0155e3eef1cbf225ed74..fbf5e951ead32125d7a0add9a67710ddc92f5655 100644 (file)
--- a/WebKitTools/Scripts/modules/landingsequence.py
+++ b/WebKitTools/Scripts/modules/landingsequence.py
@@ -81,7 +81,7 @@ class LandingSequence:
         # Make sure the tree is still green after updating, before building this patch.
         # The first patch ends up checking tree status twice, but that's OK.
         self._tool.steps.ensure_builders_are_green(self._tool.buildbot, self._options)
-        WebKitLandingScripts.build_webkit(quiet=self._options.quiet, port=self._port)
+        self._tool.steps.build_webkit(quiet=self._options.quiet, port=self._port)
 
     def test(self):
         # When running non-interactively we don't want to launch Safari and we want to exit after the first failure.

diff --git a/WebKitTools/Scripts/modules/webkitlandingscripts.py b/WebKitTools/Scripts/modules/webkitlandingscripts.py
index 245252e4645d71bca31fbc7f4625ecb444ff67f9..e0f3a125558a6fbe40aa8f83d1679d1e58cedb24 100644 (file)
--- a/WebKitTools/Scripts/modules/webkitlandingscripts.py
+++ b/WebKitTools/Scripts/modules/webkitlandingscripts.py
@@ -118,10 +118,6 @@ class WebKitLandingScripts:
         log("Running %s" % script_name)
         cls.run_and_throw_if_fail(port.script_path(script_name), quiet)
 
-    @classmethod
-    def build_webkit(cls, quiet=False, port=WebKitPort):
-        log("Building WebKit")
-        cls.run_and_throw_if_fail(port.build_webkit_command(), quiet)