+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.
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()
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 ()
+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+
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
+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.
my @skippedPrefixes;
my @frameworkHeaders;
my $framework;
-my $frameworkDirectoryName;
my %neededHeaders;
my $verbose = 0; # enable it for debugging purpose
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();
}
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");
}
}
}
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");
# 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
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)
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)
WEBKIT_OPTION_END()
set(ENABLE_GRAPHICS_CONTEXT_3D ON)
+set(ENABLE_WEBKIT_LEGACY ON)
set(ENABLE_WEBKIT ON)
-set(ENABLE_WEBKIT2 ON)
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)
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")
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 ()
"/wxcode/" "/Wxcode/" "wxcode\\\\." "Wxcode\\\\."
"/WebKitLibraries/"
"/English\\\\.lproj/"
- "/Source/WebKit/"
+ "/Source/WebKitLegacy/"
"\\\\.a$"
"\\\\.exe$"
"\\\\.mm$"