Diff
Modified: trunk/ChangeLog (173688 => 173689)
--- trunk/ChangeLog 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/ChangeLog 2014-09-17 09:29:31 UTC (rev 173689)
@@ -1,3 +1,15 @@
+2014-09-17 Renato Nagy <[email protected]>
+
+ [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 <[email protected]>
Fix FindICU.cmake
Modified: trunk/Source/PlatformGTK.cmake (173688 => 173689)
--- trunk/Source/PlatformGTK.cmake 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Source/PlatformGTK.cmake 2014-09-17 09:29:31 UTC (rev 173689)
@@ -3,14 +3,12 @@
# 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 @@
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
+)
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (173688 => 173689)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-09-17 09:29:31 UTC (rev 173689)
@@ -202,7 +202,7 @@
"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"]
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (173688 => 173689)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-09-17 09:29:31 UTC (rev 173689)
@@ -235,14 +235,7 @@
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",
WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "archive"]
@@ -903,13 +896,6 @@
CompileClass = CompileWebKit
LayoutTestClass = RunWebKit2Tests
-class BuildAndTestWebKit1OnlyFactory(BuildAndTestFactory):
- CompileClass = CompileWebKit1Only
-
-class BuildAndTestWebKit2OnlyFactory(BuildAndTestFactory):
- CompileClass = CompileWebKit2Only
- LayoutTestClass = RunWebKit2Tests
-
class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
LayoutTestClass = None
Modified: trunk/Tools/ChangeLog (173688 => 173689)
--- trunk/Tools/ChangeLog 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/ChangeLog 2014-09-17 09:29:31 UTC (rev 173689)
@@ -1,3 +1,38 @@
+2014-09-17 Renato Nagy <[email protected]>
+
+ [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 <[email protected]>
[iOS] Add iOS SDK name and version suffix to WebKitSystemInterface debug/release product name
Modified: trunk/Tools/Scripts/build-webkit (173688 => 173689)
--- trunk/Tools/Scripts/build-webkit 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/build-webkit 2014-09-17 09:29:31 UTC (rev 173689)
@@ -59,8 +59,6 @@
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 @@
--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 @@
'cmakeargs=s' => \$cmakeArgs,
'minimal' => \$minimal,
'only-webkit' => \$onlyWebKitProject,
- 'no-webkit1' => \$noWebKit1,
- 'no-webkit2' => \$noWebKit2,
'coverage' => \$coverageSupport,
'analyze' => \$shouldRunStaticAnalyzer,
);
@@ -246,8 +240,6 @@
}
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()) {
Modified: trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl (173688 => 173689)
--- trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl 2014-09-17 09:29:31 UTC (rev 173689)
@@ -68,8 +68,8 @@
{
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,
},
{
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (173688 => 173689)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2014-09-17 09:29:31 UTC (rev 173689)
@@ -145,7 +145,6 @@
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 @@
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
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (173688 => 173689)
--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2014-09-17 09:29:31 UTC (rev 173689)
@@ -42,5 +42,5 @@
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()])
Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (173688 => 173689)
--- trunk/Tools/Scripts/webkitpy/port/efl.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2014-09-17 09:29:31 UTC (rev 173689)
@@ -135,10 +135,6 @@
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
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (173688 => 173689)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-09-17 09:29:31 UTC (rev 173689)
@@ -69,9 +69,6 @@
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 @@
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 @@
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
Modified: trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py (173688 => 173689)
--- trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2014-09-17 09:29:31 UTC (rev 173689)
@@ -52,24 +52,14 @@
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'])
+ self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk',
+ '/mock-checkout/LayoutTests/platform/wk2'])
- 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'])
-
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()
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (173688 => 173689)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-09-17 09:29:31 UTC (rev 173689)
@@ -91,8 +91,8 @@
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):
