[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
abarth at webkit.org
abarth at webkit.org
Thu Dec 3 13:41:34 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 2058420992ab6f502b435cf0c3e246753d7f75f9
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 20 21:03:12 2009 +0000
2009-11-20 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Pass the port information to the child process
https://bugs.webkit.org/show_bug.cgi?id=31736
We need to do this so the child process knows what to build!
* Scripts/bugzilla-tool:
* Scripts/modules/landingsequence.py:
* Scripts/modules/webkitport.py:
* Scripts/modules/webkitport_unittest.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51253 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 71cd28c..384a8d9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,20 @@
Reviewed by Eric Seidel.
+ Pass the port information to the child process
+ https://bugs.webkit.org/show_bug.cgi?id=31736
+
+ We need to do this so the child process knows what to build!
+
+ * Scripts/bugzilla-tool:
+ * Scripts/modules/landingsequence.py:
+ * Scripts/modules/webkitport.py:
+ * Scripts/modules/webkitport_unittest.py:
+
+2009-11-20 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
Support Qt port in build-queue
https://bugs.webkit.org/show_bug.cgi?id=31733
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index a02258d..030f65b 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -761,12 +761,16 @@ class BuildQueue(AbstractTryQueue):
options = WebKitPort.port_options()
AbstractTryQueue.__init__(self, options)
+ def begin_work_queue(self):
+ AbstractTryQueue.begin_work_queue(self)
+ self.port = WebKitPort.port(self.options)
+
def should_proceed_with_work_item(self, patch):
# FIXME: We should check whether we're currently able to build!
return (True, "Building patch %s on bug %s." % (patch["id"], patch["bug_id"]), patch["bug_id"])
def process_work_item(self, patch):
- self.run_bugzilla_tool(["build-attachment", "--force-clean", patch["id"]])
+ self.run_bugzilla_tool(["build-attachment", self.port.flag(), "--force-clean", patch["id"]])
class BugzillaTool(MultiCommandTool):
diff --git a/WebKitTools/Scripts/modules/landingsequence.py b/WebKitTools/Scripts/modules/landingsequence.py
index 7264ca3..55f6d96 100644
--- a/WebKitTools/Scripts/modules/landingsequence.py
+++ b/WebKitTools/Scripts/modules/landingsequence.py
@@ -40,7 +40,7 @@ class LandingSequence:
self._patch = patch
self._options = options
self._tool = tool
- self._port = WebKitPort.get_port(self._options)
+ self._port = WebKitPort.port(self._options)
def run(self):
self.update()
diff --git a/WebKitTools/Scripts/modules/webkitport.py b/WebKitTools/Scripts/modules/webkitport.py
index ae7050b..a524bc6 100644
--- a/WebKitTools/Scripts/modules/webkitport.py
+++ b/WebKitTools/Scripts/modules/webkitport.py
@@ -41,13 +41,16 @@ class WebKitPort():
@staticmethod
def port_options():
return [
- make_option("--qt", action="store_true", dest="qt", default=False, help="Use the Qt port."),
+ make_option("--port", action="store", dest="port", default=None, help="Specify a port (e.g., mac, qt, gtk, ...)."),
]
@staticmethod
- def get_port(options):
- if options.qt:
+ def port(options):
+ if options.port == "mac":
+ return MacPort
+ if options.port == "qt":
return QtPort
+ # FIXME: We should default to WinPort on Windows.
return MacPort
@classmethod
@@ -55,6 +58,10 @@ class WebKitPort():
raise NotImplementedError, "subclasses must implement"
@classmethod
+ def flag(cls):
+ raise NotImplementedError, "subclasses must implement"
+
+ @classmethod
def run_webkit_tests_command(cls):
return [cls.script_path("run-webkit-tests")]
@@ -68,6 +75,10 @@ class MacPort(WebKitPort):
def name(cls):
return "Mac"
+ @classmethod
+ def flag(cls):
+ return "--port=mac"
+
class QtPort(WebKitPort):
@classmethod
@@ -75,6 +86,10 @@ class QtPort(WebKitPort):
return "Qt"
@classmethod
+ def flag(cls):
+ return "--port=qt"
+
+ @classmethod
def build_webkit_command(cls):
command = WebKitPort.build_webkit_command()
command.append("--qt")
diff --git a/WebKitTools/Scripts/modules/webkitport_unittest.py b/WebKitTools/Scripts/modules/webkitport_unittest.py
index 4cf68e3..83b8921 100644
--- a/WebKitTools/Scripts/modules/webkitport_unittest.py
+++ b/WebKitTools/Scripts/modules/webkitport_unittest.py
@@ -34,11 +34,13 @@ from modules.webkitport import WebKitPort, MacPort, QtPort
class WebKitPortTest(unittest.TestCase):
def test_mac_port(self):
self.assertEquals(MacPort.name(), "Mac")
+ self.assertEquals(MacPort.flag(), "--port=mac")
self.assertEquals(MacPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests")])
self.assertEquals(MacPort.build_webkit_command(), [WebKitPort.script_path("build-webkit")])
def test_qt_port(self):
self.assertEquals(QtPort.name(), "Qt")
+ self.assertEquals(QtPort.flag(), "--port=qt")
self.assertEquals(QtPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests")])
self.assertEquals(QtPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--qt"])
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list