Changeset 140317 in webkit

Timestamp:

Jan 21, 2013 3:10:27 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Stop building WebKit2 on GTK EWSs
​https://bugs.webkit.org/show_bug.cgi?id=107435

Reviewed by Philippe Normand.

The WebKit2 build of the GTK is at the moment not efficiently maintainable,
so stop building it on GTK EWSs.

• Scripts/webkitpy/common/config/ports.py:

(GtkPort.build_webkit_command):

• Scripts/webkitpy/common/config/ports_unittest.py:

(DeprecatedPortTest.test_gtk_port):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/ports.py (modified) (1 diff)
• Scripts/webkitpy/common/config/ports_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-21  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Stop building WebKit2 on GTK EWSs
+        https://bugs.webkit.org/show_bug.cgi?id=107435
+
+        Reviewed by Philippe Normand.
+
+        The WebKit2 build of the GTK is at the moment not efficiently maintainable,
+        so stop building it on GTK EWSs.
+
+        * Scripts/webkitpy/common/config/ports.py:
+        (GtkPort.build_webkit_command):
+        * Scripts/webkitpy/common/config/ports_unittest.py:
+        (DeprecatedPortTest.test_gtk_port):
+
 2013-01-21  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Tools/Scripts/webkitpy/common/config/ports.py

@@ -143 +143 @@
         command.append("--gtk")
         command.append("--update-gtk")
+        command.append("--no-webkit2")
         command.append(super(GtkPort, self).makeArgs())
         return command

trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py

@@ -43 +43 @@
         self.assertEqual(GtkPort().flag(), "--port=gtk")
         self.assertEqual(GtkPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk"])
-        self.assertEqual(GtkPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
-        self.assertEqual(GtkPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
+        self.assertEqual(GtkPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit2", DeprecatedPort().makeArgs()])
+        self.assertEqual(GtkPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit2", DeprecatedPort().makeArgs()])
 
     def test_efl_port(self):