[webkit-changes] [163621] trunk/Tools

Fri, 07 Feb 2014 03:40:35 -0800

Title: [163621] trunk/Tools
Revision
163621
Author
[email protected]
Date
2014-02-07 03:44:31 -0800 (Fri, 07 Feb 2014)

Log Message

[GTK] Disable gtk-doc in EWS
https://bugs.webkit.org/show_bug.cgi?id=128370

Reviewed by Carlos Garcia Campos.

Disable gtk-doc generation in EWS due to http://webkit.org/b/128369.

* Scripts/webkitpy/common/config/ports.py:
(GtkPort.build_webkit_command): Add --disable-gtk-doc arg.
(GtkWK2Port.build_webkit_command): Ditto.
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_gtk_port): Ditto.
(DeprecatedPortTest.test_gtk_wk2_port): Ditto.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (163620 => 163621)


--- trunk/Tools/ChangeLog	2014-02-07 10:52:08 UTC (rev 163620)
+++ trunk/Tools/ChangeLog	2014-02-07 11:44:31 UTC (rev 163621)
@@ -1,3 +1,19 @@
+2014-02-07  Manuel Rego Casasnovas  <[email protected]>
+
+        [GTK] Disable gtk-doc in EWS
+        https://bugs.webkit.org/show_bug.cgi?id=128370
+
+        Reviewed by Carlos Garcia Campos.
+
+        Disable gtk-doc generation in EWS due to http://webkit.org/b/128369.
+
+        * Scripts/webkitpy/common/config/ports.py:
+        (GtkPort.build_webkit_command): Add --disable-gtk-doc arg.
+        (GtkWK2Port.build_webkit_command): Ditto.
+        * Scripts/webkitpy/common/config/ports_unittest.py:
+        (DeprecatedPortTest.test_gtk_port): Ditto.
+        (DeprecatedPortTest.test_gtk_wk2_port): Ditto.
+
 2014-02-07  Jinwoo Song  <[email protected]>
 
         [EFL][WK2] WebView should be able to configure to set fixed layout

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


--- trunk/Tools/Scripts/webkitpy/common/config/ports.py	2014-02-07 10:52:08 UTC (rev 163620)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py	2014-02-07 11:44:31 UTC (rev 163621)
@@ -150,6 +150,8 @@
         command.append("--gtk")
         command.append("--update-gtk")
         command.append("--no-webkit2")
+        # FIXME: Disable gtk-doc temporarily due to http://webkit.org/b/128369.
+        command.append("--disable-gtk-doc")
         command.append(super(GtkPort, self).makeArgs())
         return command
 
@@ -167,6 +169,8 @@
         command.append("--gtk")
         command.append("--update-gtk")
         command.append("--no-webkit1")
+        # FIXME: Disable gtk-doc temporarily due to http://webkit.org/b/128369.
+        command.append("--disable-gtk-doc")
         command.append(super(GtkWK2Port, self).makeArgs())
         return command

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


--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py	2014-02-07 10:52:08 UTC (rev 163620)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py	2014-02-07 11:44:31 UTC (rev 163621)
@@ -42,14 +42,14 @@
     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", "--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()])
+        self.assertEqual(GtkPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit2", "--disable-gtk-doc", DeprecatedPort().makeArgs()])
+        self.assertEqual(GtkPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit2", "--disable-gtk-doc", DeprecatedPort().makeArgs()])
 
     def test_gtk_wk2_port(self):
         self.assertEqual(GtkWK2Port().flag(), "--port=gtk-wk2")
         self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk", "-2"])
-        self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
-        self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
+        self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit1", "--disable-gtk-doc", DeprecatedPort().makeArgs()])
+        self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit1", "--disable-gtk-doc", DeprecatedPort().makeArgs()])
 
     def test_efl_port(self):
         self.assertEqual(EflPort().flag(), "--port=efl")

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to