Skip to content

Commit

Permalink
[GTK4] Change API version from webkit2gtk-5.0 to webkitgtk-5.0
Browse files Browse the repository at this point in the history 
https://bugs.webkit.org/show_bug.cgi?id=228250

Reviewed by Carlos Garcia Campos.

* Source/WebDriver/gtk/WebDriverServiceGtk.cpp:
(WebDriver::WebDriverService::platformParseCapabilities const):
* Source/WebKit/PlatformGTK.cmake:
* Source/WebKit/PlatformWPE.cmake:
* Source/WebKit/Scripts/glib/generate-api-header.py:
* Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp:
(injectedBundleDirectory):
* Source/WebKit/UIProcess/API/glib/WebKitWebView.h.in:
* Source/WebKit/UIProcess/API/gtk/WebKitColorChooserRequest.h.in: Renamed from Source/WebKit/UIProcess/API/gtk/WebKitColorChooserRequest.h.
* Source/WebKit/UIProcess/API/gtk/WebKitEnumTypes.cpp.in: Renamed from Source/WebKit/UIProcess/API/gtk/WebKitEnumTypes.cpp.template.
* Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in: Renamed from Source/WebKit/UIProcess/API/gtk/WebKitEnumTypes.h.template.
* Source/WebKit/UIProcess/API/gtk/WebKitEnumTypesGtk4.h.in: Copied from Source/WebKit/UIProcess/API/wpe/WebKitEnumTypes.h.template.
* Source/WebKit/UIProcess/API/gtk/WebKitPointerLockPermissionRequest.h.in: Renamed from Source/WebKit/UIProcess/API/gtk/WebKitPointerLockPermissionRequest.h.
* Source/WebKit/UIProcess/API/gtk/WebKitPrintCustomWidget.h.in: Renamed from Source/WebKit/UIProcess/API/gtk/WebKitPrintCustomWidget.h.
* Source/WebKit/UIProcess/API/gtk/WebKitPrintOperation.h.in: Renamed from Source/WebKit/UIProcess/API/gtk/WebKitPrintOperation.h.
* Source/WebKit/UIProcess/API/gtk/WebKitVersion.h.in:
* Source/WebKit/UIProcess/API/gtk/WebKitWebInspector.h.in: Renamed from Source/WebKit/UIProcess/API/gtk/WebKitWebInspector.h.
* Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.h.in:
* Source/WebKit/UIProcess/API/gtk/webkit.h: Added.
* Source/WebKit/UIProcess/API/gtk/webkit2.h:
* Source/WebKit/UIProcess/API/wpe/WebKitEnumTypes.cpp.in: Renamed from Source/WebKit/UIProcess/API/wpe/WebKitEnumTypes.cpp.template.
* Source/WebKit/UIProcess/API/wpe/WebKitEnumTypes.h.in: Renamed from Source/WebKit/UIProcess/API/wpe/WebKitEnumTypes.h.template.
* Source/WebKit/UIProcess/Inspector/gtk/WebInspectorUIProxyGtk.cpp:
(WebKit::inspectorWebsiteDataStore):
* Source/WebKit/WebProcess/InjectedBundle/API/glib/webkit-web-extension.h.in:
* Source/WebKit/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.cpp.in: Renamed from Source/WebKit/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.cpp.template.
* Source/WebKit/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypesGtk3.h.in: Copied from Source/WebKit/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.h.template.
* Source/WebKit/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypesGtk4.h.in: Renamed from Source/WebKit/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.h.template.
* Source/WebKit/WebProcess/InjectedBundle/API/wpe/WebKitWebProcessEnumTypes.cpp.in: Renamed from Source/WebKit/WebProcess/InjectedBundle/API/wpe/WebKitWebProcessEnumTypes.cpp.template.
* Source/WebKit/WebProcess/InjectedBundle/API/wpe/WebKitWebProcessEnumTypes.h.in: Renamed from Source/WebKit/WebProcess/InjectedBundle/API/wpe/WebKitWebProcessEnumTypes.h.template.
* Source/WebKit/gtk/urlmap.js.in:
* Source/WebKit/gtk/webkitgtk-web-extension.pc.in: Renamed from Source/WebKit/gtk/webkit2gtk-web-extension.pc.in.
* Source/WebKit/gtk/webkitgtk-webextension.toml.in: Renamed from Source/WebKit/gtk/webkit2gtk-webextension.toml.in.
* Source/WebKit/gtk/webkitgtk.pc.in: Renamed from Source/WebKit/gtk/webkit2gtk.pc.in.
* Source/WebKit/gtk/webkitgtk.toml.in: Renamed from Source/WebKit/gtk/webkit2gtk.toml.in.
* Source/cmake/OptionsGTK.cmake:
* Tools/CISupport/built-product-archive:
* Tools/MiniBrowser/gtk/BrowserDownloadsBar.h:
* Tools/MiniBrowser/gtk/BrowserSearchBox.h:
* Tools/MiniBrowser/gtk/BrowserSettingsDialog.h:
* Tools/MiniBrowser/gtk/BrowserTab.h:
* Tools/MiniBrowser/gtk/BrowserWindow.h:
* Tools/MiniBrowser/gtk/CMakeLists.txt:
* Tools/MiniBrowser/gtk/main.c:
(activate):
* Tools/Scripts/webkitpy/style/checker.py:
* Tools/TestWebKitAPI/Tests/WebKitGLib/TestInputMethodContext.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGLib/WebExtensionTest.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGLib/WebProcessTest.h:
* Tools/TestWebKitAPI/Tests/WebKitGtk/AutocleanupsTest.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/DOMClientRectTest.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/DOMDOMWindowTest.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/DOMNodeFilterTest.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/DOMNodeTest.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/DOMXPathNSResolverTest.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/TestAutocleanups.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/TestDOMClientRect.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/TestDOMDOMWindow.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/TestDOMNode.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/TestDOMNodeFilter.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/TestDOMXPathNSResolver.cpp:
* Tools/TestWebKitAPI/Tests/WebKitGtk/TestWebKitVersion.cpp:
* Tools/TestWebKitAPI/glib/PlatformGTK.cmake:
* Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h:
* Tools/TestWebKitAPI/glib/WebKitGLib/gtk/WebViewTestGtk.cpp:
* Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:
* Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
* Tools/gtk/manifest.txt.in:

Canonical link: https://commits.webkit.org/254269@main
  • Loading branch information
@mcatanzaro
mcatanzaro committed Sep 8, 2022
1 parent ef69496 commit 5b5c7d2
Show file tree
Hide file tree
Showing 65 changed files with 566 additions and 212 deletions.
2 changes: 1 addition & 1 deletion Source/WebDriver/gtk/WebDriverServiceGtk.cpp
View file
Expand Up @@ -110,7 +110,7 @@ bool WebDriverService::platformMatchCapability(const String&, const Ref<JSON::Va

void WebDriverService::platformParseCapabilities(const JSON::Object& matchedCapabilities, Capabilities& capabilities) const
{
capabilities.browserBinary = String(LIBEXECDIR "/webkit2gtk-" WEBKITGTK_API_VERSION_STRING "/MiniBrowser"_s);
capabilities.browserBinary = String(LIBEXECDIR "/webkit" WEBKITGTK_API_INFIX "gtk-" WEBKITGTK_API_VERSION "/MiniBrowser"_s);
capabilities.browserArguments = Vector<String> { "--automation"_s };
capabilities.useOverlayScrollbars = true;

Expand Down
131 changes: 80 additions & 51 deletions Source/WebKit/PlatformGTK.cmake
View file
Expand Up @@ -9,20 +9,20 @@ if (ENABLE_MODERN_MEDIA_CONTROLS)
include(ModernMediaControlsGResources.cmake)
endif ()

set(WebKit_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})
set(WebKit_OUTPUT_NAME webkit${WEBKITGTK_API_INFIX}gtk-${WEBKITGTK_API_VERSION})
set(WebProcess_OUTPUT_NAME WebKitWebProcess)
set(NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
set(GPUProcess_OUTPUT_NAME WebKitGPUProcess)

file(MAKE_DIRECTORY ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit)
file(MAKE_DIRECTORY ${WebKitGTK_FRAMEWORK_HEADERS_DIR})
file(MAKE_DIRECTORY ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION})
file(MAKE_DIRECTORY ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension)
file(MAKE_DIRECTORY ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-${WEBKITGTK_API_VERSION})
file(MAKE_DIRECTORY ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-webextension)

configure_file(Shared/glib/BuildRevision.h.in ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/BuildRevision.h)
configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitVersion.h)
configure_file(gtk/webkit2gtk.pc.in ${WebKitGTK_PKGCONFIG_FILE} @ONLY)
configure_file(gtk/webkit2gtk-web-extension.pc.in ${WebKitGTKWebExtension_PKGCONFIG_FILE} @ONLY)
configure_file(gtk/webkitgtk.pc.in ${WebKitGTK_PKGCONFIG_FILE} @ONLY)
configure_file(gtk/webkitgtk-web-extension.pc.in ${WebKitGTKWebExtension_PKGCONFIG_FILE} @ONLY)

if (EXISTS "${TOOLS_DIR}/glib/apply-build-revision-to-files.py")
add_custom_target(WebKit-build-revision
Expand Down Expand Up @@ -178,18 +178,18 @@ set(WebKitGTK_HEADER_TEMPLATES
${WEBKIT_DIR}/UIProcess/API/glib/WebKitWebsiteDataManager.h.in
${WEBKIT_DIR}/UIProcess/API/glib/WebKitWindowProperties.h.in
${WEBKIT_DIR}/UIProcess/API/glib/WebKitWebsitePolicies.h.in
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitColorChooserRequest.h.in
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPointerLockPermissionRequest.h.in
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPrintCustomWidget.h.in
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPrintOperation.h.in
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebInspector.h.in
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebViewBase.h.in
)

set(WebKitGTK_INSTALLED_HEADERS
${WEBKIT_DIR}/UIProcess/API/gtk/webkit${WEBKITGTK_API_INFIX}.h
${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h
${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitVersion.h
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitColorChooserRequest.h
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPointerLockPermissionRequest.h
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPrintCustomWidget.h
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitPrintOperation.h
${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebInspector.h
${WEBKIT_DIR}/UIProcess/API/gtk/webkit2.h
)

set(WebKitWebExtension_INSTALLED_HEADERS
Expand Down Expand Up @@ -433,8 +433,8 @@ set(WebKitDOM_GTKDOC_HEADERS
# This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
list(INSERT WebKit_INCLUDE_DIRECTORIES 0
"${WebKitGTK_FRAMEWORK_HEADERS_DIR}"
"${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}"
"${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension"
"${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-${WEBKITGTK_API_VERSION}"
"${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-webextension"
"${WebKitGTK_DERIVED_SOURCES_DIR}/webkit"
"${WebKitGTK_DERIVED_SOURCES_DIR}"
)
Expand Down Expand Up @@ -563,6 +563,12 @@ GENERATE_API_HEADERS(WebKitWebExtension_HEADER_TEMPLATES
"-DUSE(GTK4)=$<BOOL:${USE_GTK4}>"
)

if (USE_GTK4)
set(WebKitGTK_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypesGtk4.h.in)
else ()
set(WebKitGTK_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in)
endif ()

# To generate WebKitEnumTypes.h we want to use all installed headers, except WebKitEnumTypes.h itself.
set(WebKitGTK_ENUM_GENERATION_HEADERS ${WebKitGTK_INSTALLED_HEADERS})
list(REMOVE_ITEM WebKitGTK_ENUM_GENERATION_HEADERS ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h)
Expand All @@ -571,22 +577,28 @@ add_custom_command(
${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.cpp
DEPENDS ${WebKitGTK_ENUM_GENERATION_HEADERS}

COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypes.h.template ${WebKitGTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h
COMMAND glib-mkenums --template ${WebKitGTK_ENUM_HEADER_TEMPLATE} ${WebKitGTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h

COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.template ${WebKitGTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.cpp
COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.in ${WebKitGTK_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.cpp
VERBATIM
)

if (USE_GTK4)
set(WebKitGTK_WEB_PROCESS_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypesGtk4.h.in)
else ()
set(WebKitGTK_WEB_PROCESS_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypesGtk3.h.in)
endif ()

set(WebKitGTK_WEB_PROCESS_ENUM_GENERATION_HEADERS ${WebKitWebExtension_INSTALLED_HEADERS})
list(REMOVE_ITEM WebKitGTK_WEB_PROCESS_ENUM_GENERATION_HEADERS ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitWebProcessEnumTypes.h)
add_custom_command(
OUTPUT ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitWebProcessEnumTypes.h
${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitWebProcessEnumTypes.cpp
DEPENDS ${WebKitGTK_WEB_PROCESS_ENUM_GENERATION_HEADERS}

COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.h.template ${WebKitGTK_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitWebProcessEnumTypes.h
COMMAND glib-mkenums --template ${WebKitGTK_WEB_PROCESS_ENUM_HEADER_TEMPLATE} ${WebKitGTK_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitWebProcessEnumTypes.h

COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.cpp.template ${WebKitGTK_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitWebProcessEnumTypes.cpp
COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebProcessEnumTypes.cpp.in ${WebKitGTK_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitWebProcessEnumTypes.cpp
VERBATIM
)

Expand Down Expand Up @@ -653,36 +665,58 @@ if (ENABLE_WAYLAND_TARGET)
endif ()

# Commands for building the built-in injected bundle.
add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
ADD_WEBKIT_PREFIX_HEADER(webkit2gtkinjectedbundle)
target_link_libraries(webkit2gtkinjectedbundle WebKit)
add_library(webkit${WEBKITGTK_API_INFIX}gtkinjectedbundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
ADD_WEBKIT_PREFIX_HEADER(webkit${WEBKITGTK_API_INFIX}gtkinjectedbundle)
target_link_libraries(webkit${WEBKITGTK_API_INFIX}gtkinjectedbundle WebKit)

target_include_directories(webkit2gtkinjectedbundle PRIVATE
target_include_directories(webkit${WEBKITGTK_API_INFIX}gtkinjectedbundle PRIVATE
$<TARGET_PROPERTY:WebKit,INCLUDE_DIRECTORIES>
"${DERIVED_SOURCES_DIR}/InjectedBundle"
"${WebKitGTK_FRAMEWORK_HEADERS_DIR}"
"${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}"
"${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit${WEBKITGTK_API_INFIX}gtk-${WEBKITGTK_API_VERSION}"
"${WebKitGTK_DERIVED_SOURCES_DIR}/webkit"
)

target_include_directories(webkit2gtkinjectedbundle SYSTEM PRIVATE
target_include_directories(webkit${WEBKITGTK_API_INFIX}gtkinjectedbundle SYSTEM PRIVATE
${WebKit_SYSTEM_INCLUDE_DIRECTORIES}
)

if (COMPILER_IS_GCC_OR_CLANG)
WEBKIT_ADD_TARGET_CXX_FLAGS(webkit2gtkinjectedbundle -Wno-unused-parameter)
WEBKIT_ADD_TARGET_CXX_FLAGS(webkit${WEBKITGTK_API_INFIX}gtkinjectedbundle -Wno-unused-parameter)
endif ()

install(TARGETS webkit2gtkinjectedbundle
DESTINATION "${LIB_INSTALL_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/injected-bundle"
# For GTK 3 builds, we have to maintain webkit2/webkit2.h and webkit2/webkit-web-extension.h for API
# compatibility. These are the only headers still installed under webkit2/. Install them manually.
if (NOT USE_GTK4)
file(MAKE_DIRECTORY ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit2)
add_custom_command(
OUTPUT ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit2/webkit2.h ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit2/webkit-web-extension.h
DEPENDS ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/webkit-web-extension.h
COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT_DIR}/UIProcess/API/gtk/webkit2.h ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/webkit-web-extension.h ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit2/
VERBATIM
)

list(APPEND WebKit_SOURCES ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit2/webkit2.h ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit2/webkit-web-extension.h)

list(REMOVE_ITEM WebKitGTK_INSTALLED_HEADERS ${WEBKIT_DIR}/UIProcess/API/gtk/webkit2.h)
list(REMOVE_ITEM WebKitWebExtension_INSTALLED_HEADERS ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/webkit-web-extension.h)

install(FILES ${WEBKIT_DIR}/UIProcess/API/gtk/webkit2.h
${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/webkit-web-extension.h
DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit2"
)
endif ()

install(TARGETS webkit${WEBKITGTK_API_INFIX}gtkinjectedbundle
DESTINATION "${LIB_INSTALL_DIR}/webkit${WEBKITGTK_API_INFIX}gtk-${WEBKITGTK_API_VERSION}/injected-bundle"
)
install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
"${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit/webkit${WEBKITGTK_API_INFIX}gtk-${WEBKITGTK_API_VERSION}.pc"
"${CMAKE_BINARY_DIR}/Source/WebKit/webkit${WEBKITGTK_API_INFIX}gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
)
install(FILES ${WebKitGTK_INSTALLED_HEADERS}
${WebKitWebExtension_INSTALLED_HEADERS}
DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit2"
DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit"
)
install(FILES ${WebKitDOM_INSTALLED_HEADERS}
DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom"
Expand All @@ -692,42 +726,37 @@ add_custom_target(WebKit-forwarding-headers
COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
)

# These symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
# These symbolic link allows includes like #include <webkit/WebkitWebView.h>, which simulates installed headers.
add_custom_command(
OUTPUT ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2
OUTPUT ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit
DEPENDS ${WEBKIT_DIR}/UIProcess/API/gtk
COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2
)
add_custom_command(
OUTPUT ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit2
DEPENDS ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit
COMMAND ln -n -s -f ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit2
COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit
)
add_custom_command(
OUTPUT ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkit2
OUTPUT ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-webextension/webkit
DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk
COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkit2
COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-webextension/webkit
)
add_custom_command(
OUTPUT ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkitdom
OUTPUT ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-webextension/webkitdom
DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM
COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkitdom
COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/gtk/DOM ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-webextension/webkitdom
)
add_custom_target(WebKit-fake-api-headers
DEPENDS ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2
${WebKitGTK_DERIVED_SOURCES_DIR}/webkit2
${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkit2
${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkitdom
DEPENDS ${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkit
${WebKitGTK_DERIVED_SOURCES_DIR}/webkit
${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-webextension/webkit
${WebKitGTK_FRAMEWORK_HEADERS_DIR}/webkitgtk-webextension/webkitdom
)

list(APPEND WebKit_DEPENDENCIES
WebKit-fake-api-headers
WebKit-forwarding-headers
)

GI_INTROSPECT(WebKit2 ${WEBKITGTK_API_VERSION} webkit2/webkit2.h
GI_INTROSPECT(WebKit${WEBKITGTK_API_INFIX} ${WEBKITGTK_API_VERSION} webkit${WEBKITGTK_API_INFIX}/webkit${WEBKITGTK_API_INFIX}.h
TARGET WebKit
PACKAGE webkit2gtk
PACKAGE webkit${WEBKITGTK_API_INFIX}gtk
IDENTIFIER_PREFIX WebKit
SYMBOL_PREFIX webkit
DEPENDENCIES
Expand All @@ -741,13 +770,13 @@ GI_INTROSPECT(WebKit2 ${WEBKITGTK_API_VERSION} webkit2/webkit2.h
UIProcess/API/gtk
NO_IMPLICIT_SOURCES
)
GI_DOCGEN(WebKit2 gtk/webkit2gtk.toml.in
GI_DOCGEN(WebKit${WEBKITGTK_API_INFIX} gtk/webkitgtk.toml.in
CONTENT_TEMPLATES gtk/urlmap.js
)

GI_INTROSPECT(WebKit2WebExtension ${WEBKITGTK_API_VERSION} webkit2/webkit-web-extension.h
GI_INTROSPECT(WebKit${WEBKITGTK_API_INFIX}WebExtension ${WEBKITGTK_API_VERSION} webkit${WEBKITGTK_API_INFIX}/webkit-web-extension.h
TARGET WebKit
PACKAGE webkit2gtk-web-extension
PACKAGE webkit${WEBKITGTK_API_INFIX}gtk-web-extension
IDENTIFIER_PREFIX WebKit
SYMBOL_PREFIX webkit
DEPENDENCIES
Expand All @@ -774,6 +803,6 @@ GI_INTROSPECT(WebKit2WebExtension ${WEBKITGTK_API_VERSION} webkit2/webkit-web-ex
WebProcess/InjectedBundle/API/glib/DOM
NO_IMPLICIT_SOURCES
)
GI_DOCGEN(WebKit2WebExtension gtk/webkit2gtk-webextension.toml.in
GI_DOCGEN(WebKit${WEBKITGTK_API_INFIX}WebExtension gtk/webkitgtk-webextension.toml.in
CONTENT_TEMPLATES gtk/urlmap.js
)
14 changes: 4 additions & 10 deletions Source/WebKit/PlatformWPE.cmake
View file
Expand Up @@ -61,12 +61,6 @@ add_custom_command(
COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/wpe ${FORWARDING_HEADERS_WPE_DIR}/wpe
)

add_custom_command(
OUTPUT ${DERIVED_SOURCES_WPE_API_DIR}/webkit2
DEPENDS ${DERIVED_SOURCES_WPE_API_DIR}/webkit
COMMAND ln -n -s -f ${DERIVED_SOURCES_WPE_API_DIR}/webkit ${DERIVED_SOURCES_WPE_API_DIR}/webkit2
)

add_custom_command(
OUTPUT ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe
DEPENDS ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe
Expand Down Expand Up @@ -275,9 +269,9 @@ add_custom_command(
${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp
DEPENDS ${WPE_ENUM_GENERATION_HEADERS}

COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEnumTypes.h.template ${WPE_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.h
COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEnumTypes.h.in ${WPE_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.h

COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEnumTypes.cpp.template ${WPE_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp
COMMAND glib-mkenums --template ${WEBKIT_DIR}/UIProcess/API/wpe/WebKitEnumTypes.cpp.in ${WPE_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.cpp
VERBATIM
)

Expand All @@ -288,9 +282,9 @@ add_custom_command(
${DERIVED_SOURCES_WPE_API_DIR}/WebKitWebProcessEnumTypes.cpp
DEPENDS ${WPE_WEB_PROCESS_ENUM_GENERATION_HEADERS}

COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/WebKitWebProcessEnumTypes.h.template ${WPE_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitWebProcessEnumTypes.h
COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/WebKitWebProcessEnumTypes.h.in ${WPE_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitWebProcessEnumTypes.h

COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/WebKitWebProcessEnumTypes.cpp.template ${WPE_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitWebProcessEnumTypes.cpp
COMMAND glib-mkenums --template ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe/WebKitWebProcessEnumTypes.cpp.in ${WPE_WEB_PROCESS_ENUM_GENERATION_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WPE_API_DIR}/WebKitWebProcessEnumTypes.cpp
VERBATIM
)

Expand Down

0 comments on commit 5b5c7d2

Please sign in to comment.