[EFL][GTK] Remove WebKit1 related codes
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Sep 2014 09:29:31 +0000 (09:29 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Sep 2014 09:29:31 +0000 (09:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=136853

Patch by Renato Nagy <rnagy@inf.u-szeged.hu> on 2014-09-17
Reviewed by Csaba Osztrogonác.

Gtk and EFL WebKit1 ports no longer exist. Webkit1 related codes were deleted
from scripts.

.:

* Source/PlatformGTK.cmake:

Tools:

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(Compile32bitJSC):
(BuildAndTestWebKit2Factory):
(CompileWebKit1Only): Deleted.
(CompileWebKit2Only): Deleted.
(BuildAndTestWebKit1OnlyFactory): Deleted.
(BuildAndTestWebKit2OnlyFactory): Deleted.
* Scripts/build-webkit:
* Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl:
* Scripts/webkitpy/common/config/ports.py:
(GtkWK2Port.build_webkit_command):
(EflWK2Port.build_webkit_command):
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_gtk_wk2_port):
* Scripts/webkitpy/port/efl.py:
(EflPort.build_webkit_command):
* Scripts/webkitpy/port/gtk.py:
(GtkPort._built_libraries_path):
(GtkPort._search_paths):
(GtkPort.test_expectations_file_position):
(GtkPort.build_webkit_command):
(GtkPort.run_webkit_tests_command):
(GtkPort.warn_if_bug_missing_in_test_expectations): Deleted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173689 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
ChangeLog
Source/PlatformGTK.cmake
Tools/BuildSlaveSupport/build.webkit.org-config/config.json
Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
Tools/ChangeLog
Tools/Scripts/build-webkit
Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl
Tools/Scripts/webkitpy/common/config/ports.py
Tools/Scripts/webkitpy/common/config/ports_unittest.py
Tools/Scripts/webkitpy/port/efl.py
Tools/Scripts/webkitpy/port/gtk.py
Tools/Scripts/webkitpy/port/gtk_unittest.py
Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

index bf38325..136e2f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-09-17  Renato Nagy  <rnagy@inf.u-szeged.hu>
+
+        [EFL][GTK] Remove WebKit1 related codes
+        https://bugs.webkit.org/show_bug.cgi?id=136853
+
+        Reviewed by Csaba Osztrogonác.
+
+        Gtk and EFL WebKit1 ports no longer exist. Webkit1 related codes were deleted
+        from scripts.
+
+        * Source/PlatformGTK.cmake:
+
 2014-09-16  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
 
         Fix FindICU.cmake
index c960bf8..a0e421a 100644 (file)
@@ -3,14 +3,12 @@ add_subdirectory(${WEBCORE_DIR}/platform/gtk/po)
 # This allows exposing a 'gir' target which builds all GObject introspection files.
 add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
 
-if (ENABLE_WEBKIT2)
-    list(APPEND DocumentationDependencies
-        WebKit2
-        "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
-        "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt"
-        GObjectDOMBindings
-    )
-endif ()
+list(APPEND DocumentationDependencies
+    GObjectDOMBindings
+    WebKit2
+    "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
+    "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt"
+)
 
 if (ENABLE_GTKDOC)
     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk/html/
@@ -51,41 +49,40 @@ add_custom_target(check
     COMMAND ${TOOLS_DIR}/gtk/check-for-webkitdom-api-breaks
 )
 
-if (ENABLE_WEBKIT2)
-    add_custom_command(
-        OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
-        DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
-        DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
-        DEPENDS WebKit2
-        DEPENDS gtkdoc
-        COMMAND ${TOOLS_DIR}/gtk/make-dist.py
-                --source-dir=${CMAKE_SOURCE_DIR}
-                --build-dir=${CMAKE_BINARY_DIR}
-                --version=${PROJECT_VERSION}
-                ${TOOLS_DIR}/gtk/manifest.txt
-    )
 
-    add_custom_command(
-        OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
-        DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
-        COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
-    )
+add_custom_command(
+    OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+    DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
+    DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
+    DEPENDS WebKit2
+    DEPENDS gtkdoc
+    COMMAND ${TOOLS_DIR}/gtk/make-dist.py
+            --source-dir=${CMAKE_SOURCE_DIR}
+            --build-dir=${CMAKE_BINARY_DIR}
+            --version=${PROJECT_VERSION}
+            ${TOOLS_DIR}/gtk/manifest.txt
+)
 
-    add_custom_target(dist
-        DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
-    )
+add_custom_command(
+    OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
+    DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+    COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+)
 
-    add_custom_target(distcheck
-        DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
-        DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
-        DEPENDS WebKit2
-        DEPENDS gtkdoc
-        COMMAND ${TOOLS_DIR}/gtk/make-dist.py
-                --check
-                --source-dir=${CMAKE_SOURCE_DIR}
-                --build-dir=${CMAKE_BINARY_DIR}
-                --version=/webkitgtk-${PROJECT_VERSION}
-                ${TOOLS_DIR}/gtk/manifest.txt
-        COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
-    )
-endif ()
+add_custom_target(dist
+    DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
+)
+
+add_custom_target(distcheck
+    DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
+    DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
+    DEPENDS WebKit2
+    DEPENDS gtkdoc
+    COMMAND ${TOOLS_DIR}/gtk/make-dist.py
+            --check
+            --source-dir=${CMAKE_SOURCE_DIR}
+            --build-dir=${CMAKE_BINARY_DIR}
+            --version=/webkitgtk-${PROJECT_VERSION}
+            ${TOOLS_DIR}/gtk/manifest.txt
+    COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+)
index 5b36f5c..9452b6d 100644 (file)
                       "slavenames": ["wincairo-1"]
                     },
                     {
-                      "name": "EFL Linux 64-bit Release WK2", "type": "BuildAndTestWebKit2Only", "builddir": "efl-linux-64-release-wk2",
+                      "name": "EFL Linux 64-bit Release WK2", "type": "BuildAndTest", "builddir": "efl-linux-64-release-wk2",
                       "platform": "efl", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["efl-linux-slave-2"]
                     },
index 180c3e0..3ec1012 100644 (file)
@@ -235,13 +235,6 @@ class CompileLLINTCLoop(CompileWebKit):
 class Compile32bitJSC(CompileWebKit):
     command = ["perl", "./Tools/Scripts/build-jsc", "--32-bit", WithProperties("--%(configuration)s")]
 
-class CompileWebKit1Only(CompileWebKit):
-    command = ["perl", "./Tools/Scripts/build-webkit", "--no-webkit2", WithProperties("--%(configuration)s")]
-
-
-class CompileWebKit2Only(CompileWebKit):
-    command = ["perl", "./Tools/Scripts/build-webkit", "--no-webkit1", WithProperties("--%(configuration)s")]
-
 
 class ArchiveBuiltProduct(shell.ShellCommand):
     command = ["python", "./Tools/BuildSlaveSupport/built-product-archive",
@@ -903,13 +896,6 @@ class BuildAndTestWebKit2Factory(BuildAndTestFactory):
     CompileClass = CompileWebKit
     LayoutTestClass = RunWebKit2Tests
 
-class BuildAndTestWebKit1OnlyFactory(BuildAndTestFactory):
-    CompileClass = CompileWebKit1Only
-
-class BuildAndTestWebKit2OnlyFactory(BuildAndTestFactory):
-    CompileClass = CompileWebKit2Only
-    LayoutTestClass = RunWebKit2Tests
-
 class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
     LayoutTestClass = None
 
index 94f4b18..e06b23c 100644 (file)
@@ -1,3 +1,38 @@
+2014-09-17  Renato Nagy  <rnagy@inf.u-szeged.hu>
+
+        [EFL][GTK] Remove WebKit1 related codes
+        https://bugs.webkit.org/show_bug.cgi?id=136853
+
+        Reviewed by Csaba Osztrogonác.
+
+        Gtk and EFL WebKit1 ports no longer exist. Webkit1 related codes were deleted
+        from scripts.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (Compile32bitJSC):
+        (BuildAndTestWebKit2Factory):
+        (CompileWebKit1Only): Deleted.
+        (CompileWebKit2Only): Deleted.
+        (BuildAndTestWebKit1OnlyFactory): Deleted.
+        (BuildAndTestWebKit2OnlyFactory): Deleted.
+        * Scripts/build-webkit:
+        * Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl:
+        * Scripts/webkitpy/common/config/ports.py:
+        (GtkWK2Port.build_webkit_command):
+        (EflWK2Port.build_webkit_command):
+        * Scripts/webkitpy/common/config/ports_unittest.py:
+        (DeprecatedPortTest.test_gtk_wk2_port):
+        * Scripts/webkitpy/port/efl.py:
+        (EflPort.build_webkit_command):
+        * Scripts/webkitpy/port/gtk.py:
+        (GtkPort._built_libraries_path):
+        (GtkPort._search_paths):
+        (GtkPort.test_expectations_file_position):
+        (GtkPort.build_webkit_command):
+        (GtkPort.run_webkit_tests_command):
+        (GtkPort.warn_if_bug_missing_in_test_expectations): Deleted.
+
 2014-09-16  Daniel Bates  <dabates@apple.com>
 
         [iOS] Add iOS SDK name and version suffix to WebKitSystemInterface debug/release product name
index ae821dd..d96d987 100755 (executable)
@@ -59,8 +59,6 @@ my $prefixPath;
 my $makeArgs = "";
 my $cmakeArgs = "";
 my $onlyWebKitProject = 0;
-my $noWebKit1 = 0;
-my $noWebKit2 = 0;
 my $coverageSupport = 0;
 my $shouldRunStaticAnalyzer = 0;
 my $startTime = time();
@@ -109,8 +107,6 @@ Usage: $programName [options] [options to pass to build system]
   --minimal                         No optional features, unless explicitly enabled
 
   --only-webkit                     Build only the WebKit project
-  --no-webkit1                      Omit WebKit1 code from the build (EFL/GTK only)
-  --no-webkit2                      Omit WebKit2 code from the build
 
 EOF
 
@@ -124,8 +120,6 @@ my %options = (
     'cmakeargs=s' => \$cmakeArgs,
     'minimal' => \$minimal,
     'only-webkit' => \$onlyWebKitProject,
-    'no-webkit1' => \$noWebKit1,
-    'no-webkit2' => \$noWebKit2,
     'coverage' => \$coverageSupport,
     'analyze' => \$shouldRunStaticAnalyzer,
 );
@@ -246,8 +240,6 @@ if (isInspectorFrontend()) {
 }
 
 if (isCMakeBuild()) {
-    $cmakeArgs = "-DENABLE_WEBKIT=OFF "  . $cmakeArgs if $noWebKit1;
-    $cmakeArgs = "-DENABLE_WEBKIT2=OFF " . $cmakeArgs if $noWebKit2;
 
     # By default we build using all of the available CPUs.
     if (!isWinCE()) {
index 28b89eb..7b50330 100644 (file)
@@ -68,8 +68,8 @@ my @testCases = (
 {
     description => "option whose value is the empty string and follows an equal sign", # Unrecognized argument; no change 
     argToCheck => "--sdk",
-    args => ["--clean", "--debug", "--sdk=", "--no-webkit2"],
-    expectedArgs => ["--clean", "--debug", "--sdk=", "--no-webkit2"],
+    args => ["--clean", "--debug", "--sdk="],
+    expectedArgs => ["--clean", "--debug", "--sdk="],
     expectedReturn => undef,
 },
 {
index e4b54fd..b70b83c 100644 (file)
@@ -145,7 +145,6 @@ class GtkWK2Port(DeprecatedPort):
         command = super(GtkWK2Port, self).build_webkit_command(build_style=build_style)
         command.append("--gtk")
         command.append("--update-gtk")
-        command.append("--no-webkit1")
         command.append(super(GtkWK2Port, self).makeArgs())
         return command
 
@@ -163,6 +162,5 @@ class EflWK2Port(DeprecatedPort):
         command = super(EflWK2Port, self).build_webkit_command(build_style=build_style)
         command.append("--efl")
         command.append("--update-efl")
-        command.append("--no-webkit1")
         command.append(super(EflWK2Port, self).makeArgs())
         return command
index 03ef50b..e4452cf 100644 (file)
@@ -42,5 +42,5 @@ class DeprecatedPortTest(unittest.TestCase):
     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", DeprecatedPort().makeArgs()])
+        self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
index d225d65..53af15f 100644 (file)
@@ -135,10 +135,6 @@ class EflPort(Port):
     def build_webkit_command(self, build_style=None):
         command = super(EflPort, self).build_webkit_command(build_style)
         command.extend(["--efl", "--update-efl"])
-        if self.get_option('webkit_test_runner'):
-            command.append("--no-webkit1")
-        else:
-            command.append("--no-webkit2")
         command.append(super(EflPort, self).make_args())
         return command
 
index ef9b483..aebcb53 100644 (file)
@@ -69,9 +69,6 @@ class GtkPort(Port):
     def _built_libraries_path(self, *path):
         return self._build_path(*(('lib',) + path))
 
-    def warn_if_bug_missing_in_test_expectations(self):
-        return not self.get_option('webkit_test_runner')
-
     def _port_flag_for_scripts(self):
         return "--gtk"
 
@@ -177,11 +174,8 @@ class GtkPort(Port):
 
     def _search_paths(self):
         search_paths = []
-        if self.get_option('webkit_test_runner'):
-            search_paths.extend([self.port_name + '-wk2', 'wk2'])
-        else:
-            search_paths.append(self.port_name + '-wk1')
         search_paths.append(self.port_name)
+        search_paths.append('wk2')
         search_paths.extend(self.get_option("additional_platform_directory", []))
         return search_paths
 
@@ -215,21 +209,17 @@ class GtkPort(Port):
     def _get_crash_log(self, name, pid, stdout, stderr, newer_than):
         return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
 
+    def test_expectations_file_position(self):
+        # GTK port baseline search path is gtk -> wk2 -> generic (as gtk-wk2 and gtk baselines are merged), so port test expectations file is at third to last position.
+        return 2
+
     def build_webkit_command(self, build_style=None):
         command = super(GtkPort, self).build_webkit_command(build_style)
         command.extend(["--gtk", "--update-gtk"])
-
-        if self.get_option('webkit_test_runner'):
-            command.append("--no-webkit1")
-        else:
-            command.append("--no-webkit2")
-
         command.append(super(GtkPort, self).make_args())
         return command
 
     def run_webkit_tests_command(self):
         command = super(GtkPort, self).run_webkit_tests_command()
         command.append("--gtk")
-        if self.get_option('webkit_test_runner'):
-            command.append("-2")
         return command
index 1b66d91..2c723bb 100644 (file)
@@ -52,24 +52,14 @@ class GtkPortTest(port_testcase.PortTestCase):
 
     def test_default_baseline_search_path(self):
         port = self.make_port()
-        self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk-wk1',
-            '/mock-checkout/LayoutTests/platform/gtk'])
-
-        port = self.make_port(options=MockOptions(webkit_test_runner=True))
-        self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk-wk2',
-            '/mock-checkout/LayoutTests/platform/wk2', '/mock-checkout/LayoutTests/platform/gtk'])
+        self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk',
+            '/mock-checkout/LayoutTests/platform/wk2'])
 
     def test_port_specific_expectations_files(self):
         port = self.make_port()
         self.assertEqual(port.expectations_files(), ['/mock-checkout/LayoutTests/TestExpectations',
-            '/mock-checkout/LayoutTests/platform/gtk/TestExpectations',
-            '/mock-checkout/LayoutTests/platform/gtk-wk1/TestExpectations'])
-
-        port = self.make_port(options=MockOptions(webkit_test_runner=True))
-        self.assertEqual(port.expectations_files(), ['/mock-checkout/LayoutTests/TestExpectations',
-            '/mock-checkout/LayoutTests/platform/gtk/TestExpectations',
             '/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
-            '/mock-checkout/LayoutTests/platform/gtk-wk2/TestExpectations'])
+            '/mock-checkout/LayoutTests/platform/gtk/TestExpectations'])
 
     def test_show_results_html_file(self):
         port = self.make_port()
index 5cb1dd1..24ef392 100644 (file)
@@ -91,8 +91,8 @@ class TestRebaselineTest(_BaseTestCase):
         self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
         self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
         self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
-        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
-        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
+        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
+        self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
         self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl")
 
     def test_rebaseline_updates_expectations_file_noop(self):