[webkit-changes] [164713] trunk/Tools

Wed, 26 Feb 2014 03:29:23 -0800

Title: [164713] trunk/Tools
Revision
164713
Author
[email protected]
Date
2014-02-26 03:32:43 -0800 (Wed, 26 Feb 2014)

Log Message

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

Reviewed by Carlos Garcia Campos.

Enable again gtk-doc generation in EWS once bug #128417 has been fixed.

* 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 (164712 => 164713)


--- trunk/Tools/ChangeLog	2014-02-26 11:24:46 UTC (rev 164712)
+++ trunk/Tools/ChangeLog	2014-02-26 11:32:43 UTC (rev 164713)
@@ -1,3 +1,19 @@
+2014-02-26  Manuel Rego Casasnovas  <[email protected]>
+
+        [GTK] Re-enable gtk-doc in EWS
+        https://bugs.webkit.org/show_bug.cgi?id=128369
+
+        Reviewed by Carlos Garcia Campos.
+
+        Enable again gtk-doc generation in EWS once bug #128417 has been fixed.
+
+        * 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-26  Martin Robinson  <[email protected]>
 
         [GTK] generate-gtkdoc can fail with WebKit1 or WebKit2 only builds

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


--- trunk/Tools/Scripts/webkitpy/common/config/ports.py	2014-02-26 11:24:46 UTC (rev 164712)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py	2014-02-26 11:32:43 UTC (rev 164713)
@@ -150,8 +150,6 @@
         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
 
@@ -169,8 +167,6 @@
         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 (164712 => 164713)


--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py	2014-02-26 11:24:46 UTC (rev 164712)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py	2014-02-26 11:32:43 UTC (rev 164713)
@@ -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", "--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()])
+        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_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", "--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()])
+        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()])
 
     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