[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 6c5b29de3d28d4924ea0514b70cbef80b600a60d
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 27 07:55:57 2009 +0000

    2009-11-26  Adam Barth  <abarth at 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: http://svn.webkit.org/repository/webkit/trunk@51433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7f86d78..8d4a9a8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -5,6 +5,19 @@
         [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 at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Kill WebKitLandingScripts
+        https://bugs.webkit.org/show_bug.cgi?id=31904
+
         Step 2: Kill ensure_builders_are_green.
 
         * Scripts/modules/buildsteps.py:
diff --git a/WebKitTools/Scripts/modules/buildsteps.py b/WebKitTools/Scripts/modules/buildsteps.py
index 51f4f1b..9d5052e 100644
--- 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 9a5d453..fbf5e95 100644
--- 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 245252e..e0f3a12 100644
--- 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)
 
 
 

-- 
WebKit Debian packaging