Fix the cMake builds (GTK and WPE.)

https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595

Reviewed by Dan Bernstein.

.:

* Source/CMakeLists.txt:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsJSCOnly.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsWPE.cmake:
* Source/cmake/WebKitFS.cmake:
* Source/cmake/WebKitPackaging.cmake:

Source/WebCore/platform/gtk/po:

* POTFILES.in:

Source/WebKit:

* Scripts/generate-forwarding-headers.pl:
(collectFrameworkHeaderPaths):
(createForwardingHeadersForFramework):

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

diff --git a/ChangeLog b/ChangeLog
index b3e654a0687825babc3055dc7bb65bf55743410f..dd18285e38e1fee94edfb241a5aec20072493148 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Fix the cMake builds (GTK and WPE.)
+        https://bugs.webkit.org/show_bug.cgi?id=174164
+        rdar://problem/33137595
+
+        Reviewed by Dan Bernstein.
+
+        * Source/CMakeLists.txt:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsJSCOnly.cmake:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+        * Source/cmake/WebKitFS.cmake:
+        * Source/cmake/WebKitPackaging.cmake:
+
 2017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
 
         Rename WebKit2.xcodeproj to WebKit.xcodeproj.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index ba9e99c045b3b2fad5b399c1acd17bdc7b05eb0b..da35b62acfab3168315e9e615ec1dcca7f2c4b53 100644 (file)
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -30,12 +30,12 @@ if (ENABLE_WEBCORE)
     add_subdirectory(WebCore)
 endif ()
 
-if (ENABLE_WEBKIT)
-    add_subdirectory(WebKit)
+if (ENABLE_WEBKIT_LEGACY)
+    add_subdirectory(WebKitLegacy)
 endif ()
 
-if (ENABLE_WEBKIT2)
-    add_subdirectory(WebKit2)
+if (ENABLE_WEBKIT)
+    add_subdirectory(WebKit)
 endif ()
 
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
@@ -56,10 +56,12 @@ if (ENABLE_WEBCORE)
     WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebCoreDerivedSources ${ADDITIONAL_COMPILER_FLAGS})
 endif ()
 
-if (ENABLE_WEBKIT)
+if (ENABLE_WEBKIT_LEGACY)
+    # FIXME: Rename this target to WebKitLegacy.
     WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_COMPILER_FLAGS})
 endif ()
 
-if (ENABLE_WEBKIT2)
+if (ENABLE_WEBKIT)
+    # FIXME: Rename this target to WebKit.
     WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit2 ${ADDITIONAL_COMPILER_FLAGS})
 endif ()

diff --git a/Source/WebCore/platform/gtk/po/ChangeLog b/Source/WebCore/platform/gtk/po/ChangeLog
index dfcda259adf53243b9d971ca759ef860e62821e1..96df0376bbdcc5571234f95005c76c9b0e4970ce 100644 (file)
--- a/Source/WebCore/platform/gtk/po/ChangeLog
+++ b/Source/WebCore/platform/gtk/po/ChangeLog
@@ -1,3 +1,13 @@
+2017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Fix the cMake builds (GTK and WPE.)
+        https://bugs.webkit.org/show_bug.cgi?id=174164
+        rdar://problem/33137595
+
+        Reviewed by Dan Bernstein.
+
+        * POTFILES.in:
+
 2017-06-25  Yuri Chornoivan  <yurchor@ukr.net>
 
         [GTK] [l10n] Updated Ukrainian translation of WebKitGTK+

diff --git a/Source/WebCore/platform/gtk/po/POTFILES.in b/Source/WebCore/platform/gtk/po/POTFILES.in
index 715922364ef568f11fa73b55832e08833870dfec..899fcd492ebeaa4cd9b6fab9bb856e25a1dc32ce 100644 (file)
--- a/Source/WebCore/platform/gtk/po/POTFILES.in
+++ b/Source/WebCore/platform/gtk/po/POTFILES.in
@@ -2,40 +2,40 @@
 LocalizedStringsGtk.cpp
 ../LocalizedStrings.cpp
 ../network/soup/NetworkStorageSessionSoup.cpp
-../../../WebKit2/Shared/API/glib/WebKitHitTestResult.cpp
-../../../WebKit2/Shared/API/glib/WebKitURIRequest.cpp
-../../../WebKit2/Shared/API/glib/WebKitURIResponse.cpp
-../../../WebKit2/Shared/WebErrors.cpp
-../../../WebKit2/Shared/glib/WebErrorsGlib.cpp
-../../../WebKit2/Shared/gtk/WebErrorsGtk.cpp
-../../../WebKit2/Shared/soup/WebErrorsSoup.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitAutomationSession.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitDownload.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitEditorState.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitFaviconDatabase.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitFileChooserRequest.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitFindController.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitNotification.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitResponsePolicyDecision.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitSettings.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitUserMediaPermissionRequest.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitWebContext.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitWebResource.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitWebsiteData.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitWebsiteDataManager.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitWebView.cpp
-../../../WebKit2/UIProcess/API/glib/WebKitWindowProperties.cpp
-../../../WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
-../../../WebKit2/UIProcess/API/gtk/WebKitColorChooserRequest.cpp
-../../../WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidget.cpp
-../../../WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp
-../../../WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp
-../../../WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
-../../../WebKit2/UIProcess/API/gtk/WebKitWebViewGtk.cpp
-../../../WebKit2/UIProcess/gtk/WebColorPickerGtk.cpp
-../../../WebKit2/UIProcess/gtk/WebKitInspectorWindow.cpp
-../../../WebKit2/UIProcess/WebEditCommandProxy.cpp
-../../../WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp
-../../../WebKit2/WebProcess/InjectedBundle/API/glib/WebKitWebHitTestResult.cpp
-../../../WebKit2/WebProcess/InjectedBundle/API/glib/WebKitWebPage.cpp
+../../../WebKit/Shared/API/glib/WebKitHitTestResult.cpp
+../../../WebKit/Shared/API/glib/WebKitURIRequest.cpp
+../../../WebKit/Shared/API/glib/WebKitURIResponse.cpp
+../../../WebKit/Shared/WebErrors.cpp
+../../../WebKit/Shared/glib/WebErrorsGlib.cpp
+../../../WebKit/Shared/gtk/WebErrorsGtk.cpp
+../../../WebKit/Shared/soup/WebErrorsSoup.cpp
+../../../WebKit/UIProcess/API/glib/WebKitAutomationSession.cpp
+../../../WebKit/UIProcess/API/glib/WebKitDownload.cpp
+../../../WebKit/UIProcess/API/glib/WebKitEditorState.cpp
+../../../WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp
+../../../WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp
+../../../WebKit/UIProcess/API/glib/WebKitFindController.cpp
+../../../WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp
+../../../WebKit/UIProcess/API/glib/WebKitNotification.cpp
+../../../WebKit/UIProcess/API/glib/WebKitResponsePolicyDecision.cpp
+../../../WebKit/UIProcess/API/glib/WebKitSettings.cpp
+../../../WebKit/UIProcess/API/glib/WebKitUserMediaPermissionRequest.cpp
+../../../WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+../../../WebKit/UIProcess/API/glib/WebKitWebResource.cpp
+../../../WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp
+../../../WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp
+../../../WebKit/UIProcess/API/glib/WebKitWebView.cpp
+../../../WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp
+../../../WebKit/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
+../../../WebKit/UIProcess/API/gtk/WebKitColorChooserRequest.cpp
+../../../WebKit/UIProcess/API/gtk/WebKitPrintCustomWidget.cpp
+../../../WebKit/UIProcess/API/gtk/WebKitPrintOperation.cpp
+../../../WebKit/UIProcess/API/gtk/WebKitWebInspector.cpp
+../../../WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
+../../../WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp
+../../../WebKit/UIProcess/gtk/WebColorPickerGtk.cpp
+../../../WebKit/UIProcess/gtk/WebKitInspectorWindow.cpp
+../../../WebKit/UIProcess/WebEditCommandProxy.cpp
+../../../WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp
+../../../WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebHitTestResult.cpp
+../../../WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebPage.cpp

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 622fbd3d0dce29ca417b94e7e736a4ef926256ea..9b576a65c4e9c02cf1f63278cc137608b35f1117 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Fix the cMake builds (GTK and WPE.)
+        https://bugs.webkit.org/show_bug.cgi?id=174164
+        rdar://problem/33137595
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/generate-forwarding-headers.pl:
+        (collectFrameworkHeaderPaths):
+        (createForwardingHeadersForFramework):
+
 2017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
 
         Rename WebKit2.xcodeproj to WebKit.xcodeproj.

diff --git a/Source/WebKit/Scripts/generate-forwarding-headers.pl b/Source/WebKit/Scripts/generate-forwarding-headers.pl
index 5ef6aa9483f76cd18c610bb3d722bf2bdb0abdec..d845bee82d493a35b86a5c6dba4bda69cd1b513f 100755 (executable)
--- a/Source/WebKit/Scripts/generate-forwarding-headers.pl
+++ b/Source/WebKit/Scripts/generate-forwarding-headers.pl
@@ -40,7 +40,6 @@ my @frameworks = ("JavaScriptCore", "WebCore", "WebKit");
 my @skippedPrefixes;
 my @frameworkHeaders;
 my $framework;
-my $frameworkDirectoryName;
 my %neededHeaders;
 my $verbose = 0; # enable it for debugging purpose
 
@@ -62,12 +61,11 @@ foreach my $prefix (@platformPrefixes) {
 
 foreach (@frameworks) {
     $framework = $_;
-    $frameworkDirectoryName = ($framework eq "WebKit") ? "WebKit2" : $framework;
     @frameworkHeaders = ();
     %neededHeaders = ();
 
     foreach (@incFromRoot) { find(\&collectNeededHeaders, abs_path($_) ); };
-    find(\&collectFrameworkHeaderPaths, File::Spec->catfile($srcRoot, $frameworkDirectoryName));
+    find(\&collectFrameworkHeaderPaths, File::Spec->catfile($srcRoot, $framework));
     createForwardingHeadersForFramework();
 }
 
@@ -89,7 +87,7 @@ sub collectFrameworkHeaderPaths {
     my $filePath = $File::Find::name;
     my $file = $_;
     if ($filePath =~ '\.h$' && $filePath !~ "ForwardingHeaders" && grep{$file eq $_} keys %neededHeaders) {
-        my $headerPath = substr($filePath, length(File::Spec->catfile($srcRoot, $frameworkDirectoryName)) + 1 );
+        my $headerPath = substr($filePath, length(File::Spec->catfile($srcRoot, $framework)) + 1 );
         push(@frameworkHeaders, $headerPath) unless (grep($headerPath =~ "$_/", @skippedPrefixes) || $headerPath =~ "config.h");
     }
 }
@@ -109,7 +107,7 @@ sub createForwardingHeadersForFramework {
         }
 
         my $forwardingHeaderPath = File::Spec->catfile($targetDirectory, $headerName);
-        my $expectedIncludeStatement = "#include \"$frameworkDirectoryName/$header\"";
+        my $expectedIncludeStatement = "#include \"$framework/$header\"";
         my $foundIncludeStatement = 0;
 
         $foundIncludeStatement = <EXISTING_HEADER> if open(EXISTING_HEADER, "<$forwardingHeaderPath");

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 03c1131a2c336a81214ea5b72763221d00f86bf7..ea725330eb2775389e1b899a7344832da5138def 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -8,7 +8,7 @@ set(WEBKITGTK_API_VERSION 4.0)
 
 # Libtool library version, not to be confused with API version.
 # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
-CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 60 0 23)
+CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 60 0 23)
 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 24 4 6)
 
 # These are shared variables, but we special case their definition so that we can use the
@@ -180,8 +180,8 @@ if (${ENABLE_X11_TARGET})
     SET_AND_EXPOSE_TO_BUILD(XP_UNIX 1)
 endif ()
 
-set(ENABLE_WEBKIT OFF)
-set(ENABLE_WEBKIT2 ON)
+set(ENABLE_WEBKIT_LEGACY OFF)
+set(ENABLE_WEBKIT ON)
 set(ENABLE_PLUGIN_PROCESS ${ENABLE_NETSCAPE_PLUGIN_API})
 
 add_definitions(-DBUILDING_GTK__=1)

diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
index e7bc770784d0ee55c592e5d6e859902eff123727..2acd33347b5882c077b76f83545e58868f7d7090 100644 (file)
--- a/Source/cmake/OptionsJSCOnly.cmake
+++ b/Source/cmake/OptionsJSCOnly.cmake
@@ -32,8 +32,8 @@ set(DEFAULT_EVENT_LOOP_TYPE "Generic")
 set(EVENT_LOOP_TYPE ${DEFAULT_EVENT_LOOP_TYPE} CACHE STRING "Implementation of event loop to be used in JavaScriptCore (one of ${ALL_EVENT_LOOP_TYPES})")
 
 set(ENABLE_WEBCORE OFF)
+set(ENABLE_WEBKIT_LEGACY OFF)
 set(ENABLE_WEBKIT OFF)
-set(ENABLE_WEBKIT2 OFF)
 
 if (WIN32)
     set(ENABLE_API_TESTS OFF)

diff --git a/Source/cmake/OptionsMac.cmake b/Source/cmake/OptionsMac.cmake
index fe79f96ab2b6e95c82681f3f9dd29c4c50a271b1..cc70594bf03e4245e118af8f0625a513baec77ec 100644 (file)
--- a/Source/cmake/OptionsMac.cmake
+++ b/Source/cmake/OptionsMac.cmake
@@ -111,5 +111,5 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
 WEBKIT_OPTION_END()
 
 set(ENABLE_GRAPHICS_CONTEXT_3D ON)
+set(ENABLE_WEBKIT_LEGACY ON)
 set(ENABLE_WEBKIT ON)
-set(ENABLE_WEBKIT2 ON)

diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
index 5aeaddf326f0217bd723c100f876bd5bb67f5761..7645c7a4739dfeed06354d4f5d7b4855ebc51196 100644 (file)
--- a/Source/cmake/OptionsWPE.cmake
+++ b/Source/cmake/OptionsWPE.cmake
@@ -51,8 +51,8 @@ WEBKIT_OPTION_END()
 SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
 
 set(ENABLE_WEBCORE ON)
-set(ENABLE_WEBKIT OFF)
-set(ENABLE_WEBKIT2 ON)
+set(ENABLE_WEBKIT_LEGACY OFF)
+set(ENABLE_WEBKIT ON)
 set(ENABLE_API_TESTS ${DEVELOPER_MODE})
 set(ENABLE_TOOLS ON)
 

diff --git a/Source/cmake/WebKitFS.cmake b/Source/cmake/WebKitFS.cmake
index b2c3c8ac56d1fda8ac769b64c72763b4a7c264f5..b4af8bbf9695913c236787e9acea32316097b23d 100644 (file)
--- a/Source/cmake/WebKitFS.cmake
+++ b/Source/cmake/WebKitFS.cmake
@@ -29,7 +29,7 @@ endif ()
 set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
 set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
-set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
+set(DERIVED_SOURCES_WEBKIT_LEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
 set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
 set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
@@ -48,11 +48,11 @@ if (ENABLE_WEBCORE)
     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR})
 endif ()
 
-if (ENABLE_WEBKIT2)
-    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
+if (ENABLE_WEBKIT)
+    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
 endif ()
 
-if (ENABLE_WEBKIT)
-    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
+if (ENABLE_WEBKIT_LEGACY)
+    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_LEGACY_DIR})
     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
 endif ()

diff --git a/Source/cmake/WebKitPackaging.cmake b/Source/cmake/WebKitPackaging.cmake
index bd67dba854676edebfd1c8fcc02ac62a0215114f..fc45ec787fdaf61f54ecc11d66116932cdbcecb2 100644 (file)
--- a/Source/cmake/WebKitPackaging.cmake
+++ b/Source/cmake/WebKitPackaging.cmake
@@ -110,7 +110,7 @@ if (NOT DEFINED CPACK_SOURCE_IGNORE_FILES)
             "/wxcode/" "/Wxcode/" "wxcode\\\\." "Wxcode\\\\."
             "/WebKitLibraries/"
             "/English\\\\.lproj/"
-            "/Source/WebKit/"
+            "/Source/WebKitLegacy/"
             "\\\\.a$"
             "\\\\.exe$"
             "\\\\.mm$"