Changeset 51253 in webkit

Timestamp:

Nov 20, 2009 1:03:12 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-11-20 Adam Barth <​abarth@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:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (2 diffs)
• Scripts/modules/landingsequence.py (modified) (1 diff)
• Scripts/modules/webkitport.py (modified) (3 diffs)
• Scripts/modules/webkitport_unittest.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-20  Adam Barth  <abarth@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:
+
 2009-11-20  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -762 +762 @@
         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!
@@ -767 +771 @@
 
     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"]])
 
 

trunk/WebKitTools/Scripts/modules/landingsequence.py

@@ -41 +41 @@
         self._options = options
         self._tool = tool
-        self._port = WebKitPort.get_port(self._options)
+        self._port = WebKitPort.port(self._options)
 
     def run(self):

trunk/WebKitTools/Scripts/modules/webkitport.py

@@ -42 +42 @@
     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
     def name(cls):
+        raise NotImplementedError, "subclasses must implement"
+
+    @classmethod
+    def flag(cls):
         raise NotImplementedError, "subclasses must implement"
 
@@ -69 +76 @@
         return "Mac"
 
+    @classmethod
+    def flag(cls):
+        return "--port=mac"
+
 
 class QtPort(WebKitPort):
@@ -76 +87 @@
 
     @classmethod
+    def flag(cls):
+        return "--port=qt"
+
+    @classmethod
     def build_webkit_command(cls):
         command = WebKitPort.build_webkit_command()

trunk/WebKitTools/Scripts/modules/webkitport_unittest.py

@@ -35 +35 @@
     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")])
@@ -40 +41 @@
     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"])