[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
abarth at webkit.org
abarth at webkit.org
Tue Jan 5 23:51:45 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 30cf7b40914cee0db925b785804bc62e8150f917
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 17 07:41:11 2009 +0000
2009-12-16 Evan Martin <evan at chromium.org>
Reviewed by Adam Barth.
Add Gtk to the early warning system WebKit port list.
https://bugs.webkit.org/show_bug.cgi?id=32629
* Scripts/modules/commands/early_warning_system.py:
* Scripts/modules/webkitport.py:
* Scripts/modules/webkitport_unittest.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52240 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0ff55cd..bf87ce0 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-16 Evan Martin <evan at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Add Gtk to the early warning system WebKit port list.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32629
+
+ * Scripts/modules/commands/early_warning_system.py:
+ * Scripts/modules/webkitport.py:
+ * Scripts/modules/webkitport_unittest.py:
+
2009-12-16 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/modules/commands/early_warning_system.py b/WebKitTools/Scripts/modules/commands/early_warning_system.py
index a4546bd..3e8fabe 100644
--- a/WebKitTools/Scripts/modules/commands/early_warning_system.py
+++ b/WebKitTools/Scripts/modules/commands/early_warning_system.py
@@ -72,6 +72,11 @@ class AbstractEarlyWarningSystem(AbstractReviewQueue):
tool.bugs.post_comment_to_bug(patch["bug_id"], message, cc=cls.watchers)
+class GtkEWS(AbstractEarlyWarningSystem):
+ name = "gtk-ews"
+ port_name = "gtk"
+
+
class QtEWS(AbstractEarlyWarningSystem):
name = "qt-ews"
port_name = "qt"
diff --git a/WebKitTools/Scripts/modules/webkitport.py b/WebKitTools/Scripts/modules/webkitport.py
index 849ac4b..99ea174 100644
--- a/WebKitTools/Scripts/modules/webkitport.py
+++ b/WebKitTools/Scripts/modules/webkitport.py
@@ -40,14 +40,14 @@ class WebKitPort():
@staticmethod
def port(port_name):
- if port_name == "mac":
- return MacPort
- if port_name == "qt":
- return QtPort
- if port_name == "chromium":
- return ChromiumPort
+ ports = {
+ "chromium": ChromiumPort,
+ "gtk": GtkPort,
+ "mac": MacPort,
+ "qt": QtPort,
+ }
# FIXME: We should default to WinPort on Windows.
- return MacPort
+ return ports.get(port_name, MacPort)
@classmethod
def name(cls):
@@ -80,6 +80,28 @@ class MacPort(WebKitPort):
return "--port=mac"
+class GtkPort(WebKitPort):
+ @classmethod
+ def name(cls):
+ return "Gtk"
+
+ @classmethod
+ def flag(cls):
+ return "--port=gtk"
+
+ @classmethod
+ def build_webkit_command(cls):
+ command = WebKitPort.build_webkit_command()
+ command.append("--gtk")
+ return command
+
+ @classmethod
+ def run_webkit_tests_command(cls):
+ command = WebKitPort.run_webkit_tests_command()
+ command.append("--gtk")
+ return command
+
+
class QtPort(WebKitPort):
@classmethod
def name(cls):
diff --git a/WebKitTools/Scripts/modules/webkitport_unittest.py b/WebKitTools/Scripts/modules/webkitport_unittest.py
index c713e83..e44b9a6 100644
--- a/WebKitTools/Scripts/modules/webkitport_unittest.py
+++ b/WebKitTools/Scripts/modules/webkitport_unittest.py
@@ -29,7 +29,7 @@
import unittest
-from modules.webkitport import WebKitPort, MacPort, QtPort, ChromiumPort
+from modules.webkitport import WebKitPort, MacPort, GtkPort, QtPort, ChromiumPort
class WebKitPortTest(unittest.TestCase):
def test_mac_port(self):
@@ -38,6 +38,12 @@ class WebKitPortTest(unittest.TestCase):
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_gtk_port(self):
+ self.assertEquals(GtkPort.name(), "Gtk")
+ self.assertEquals(GtkPort.flag(), "--port=gtk")
+ self.assertEquals(GtkPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests"), "--gtk"])
+ self.assertEquals(GtkPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--gtk"])
+
def test_qt_port(self):
self.assertEquals(QtPort.name(), "Qt")
self.assertEquals(QtPort.flag(), "--port=qt")
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list