Skip to content
Permalink
Browse files
[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.


Canonical link: https://commits.webkit.org/146393@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@163621 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
mrego committed Feb 7, 2014
1 parent ebcc7b3 commit 9e413ad37227c04e42168b3b948fbb3ee8745655
Showing with 24 additions and 4 deletions.
  1. +16 −0 Tools/ChangeLog
  2. +4 −0 Tools/Scripts/webkitpy/common/config/ports.py
  3. +4 −4 Tools/Scripts/webkitpy/common/config/ports_unittest.py
@@ -1,3 +1,19 @@
2014-02-07 Manuel Rego Casasnovas <rego@igalia.com>

[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 <jinwoo7.song@samsung.com>

[EFL][WK2] WebView should be able to configure to set fixed layout
@@ -150,6 +150,8 @@ def build_webkit_command(self, build_style=None):
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 @@ def build_webkit_command(self, build_style=None):
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

@@ -42,14 +42,14 @@ def test_mac_port(self):
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")

0 comments on commit 9e413ad

Please sign in to comment.