Title: [140317] trunk/Tools
Revision
140317
Author
[email protected]
Date
2013-01-21 03:10:27 -0800 (Mon, 21 Jan 2013)

Log 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):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (140316 => 140317)


--- trunk/Tools/ChangeLog	2013-01-21 10:33:19 UTC (rev 140316)
+++ trunk/Tools/ChangeLog	2013-01-21 11:10:27 UTC (rev 140317)
@@ -1,3 +1,18 @@
+2013-01-21  Zan Dobersek  <[email protected]>
+
+        [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  <[email protected]>
 
         MediaStream API: Update the RTCPeerConnection states to match the latest specification

Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (140316 => 140317)


--- trunk/Tools/Scripts/webkitpy/common/config/ports.py	2013-01-21 10:33:19 UTC (rev 140316)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py	2013-01-21 11:10:27 UTC (rev 140317)
@@ -142,6 +142,7 @@
         command = super(GtkPort, self).build_webkit_command(build_style=build_style)
         command.append("--gtk")
         command.append("--update-gtk")
+        command.append("--no-webkit2")
         command.append(super(GtkPort, self).makeArgs())
         return command
 

Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (140316 => 140317)


--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py	2013-01-21 10:33:19 UTC (rev 140316)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py	2013-01-21 11:10:27 UTC (rev 140317)
@@ -42,8 +42,8 @@
     def test_gtk_port(self):
         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):
         self.assertEqual(EflPort().flag(), "--port=efl")
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to