Title: [286549] trunk/Source/WebKit
- Revision
- 286549
- Author
- [email protected]
- Date
- 2021-12-06 10:40:13 -0800 (Mon, 06 Dec 2021)
Log Message
REGRESSION(r286535) [GTK] Fix clean builds after DerivedSources/WebKit2 move
https://bugs.webkit.org/show_bug.cgi?id=233881
Reviewed by Žan Doberšek.
Build fix. Covered by exiting tests.
* PlatformGTK.cmake: Add symbolic links for the public generated like
we do for the regular headers. It happened to work before because they
were created already in a webkit2 folder.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (286548 => 286549)
--- trunk/Source/WebKit/ChangeLog 2021-12-06 18:35:05 UTC (rev 286548)
+++ trunk/Source/WebKit/ChangeLog 2021-12-06 18:40:13 UTC (rev 286549)
@@ -1,3 +1,16 @@
+2021-12-06 Lauro Moura <[email protected]>
+
+ REGRESSION(r286535) [GTK] Fix clean builds after DerivedSources/WebKit2 move
+ https://bugs.webkit.org/show_bug.cgi?id=233881
+
+ Reviewed by Žan Doberšek.
+
+ Build fix. Covered by exiting tests.
+
+ * PlatformGTK.cmake: Add symbolic links for the public generated like
+ we do for the regular headers. It happened to work before because they
+ were created already in a webkit2 folder.
+
2021-12-06 Alex Christensen <[email protected]>
WKWebpagePreferences._activeContentRuleListActionPatterns should be an NSDictionary of identifier to allowed patterns
Modified: trunk/Source/WebKit/PlatformGTK.cmake (286548 => 286549)
--- trunk/Source/WebKit/PlatformGTK.cmake 2021-12-06 18:35:05 UTC (rev 286548)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2021-12-06 18:40:13 UTC (rev 286549)
@@ -875,6 +875,21 @@
COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2
)
add_custom_command(
+ OUTPUT ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2/WebKitEnumTypes.h
+ DEPENDS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h
+ COMMAND ln -n -s -f ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2/WebKitEnumTypes.h
+)
+add_custom_command(
+ OUTPUT ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2/WebKitWebProcessEnumTypes.h
+ DEPENDS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitWebProcessEnumTypes.h
+ COMMAND ln -n -s -f ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitWebProcessEnumTypes.h ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2/WebKitWebProcessEnumTypes.h
+)
+add_custom_command(
+ OUTPUT ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2/WebKitVersion.h
+ DEPENDS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitVersion.h
+ COMMAND ln -n -s -f ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit/WebKitVersion.h ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2/WebKitVersion.h
+)
+add_custom_command(
OUTPUT ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/webkit2
DEPENDS ${WEBKIT_DIR}/UIProcess/API/gtk${GTK_API_VERSION}
COMMAND ln -n -s -f ${WEBKIT_DIR}/UIProcess/API/gtk${GTK_API_VERSION} ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/webkit2
@@ -891,6 +906,9 @@
)
add_custom_target(WebKit-fake-api-headers
DEPENDS ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2/WebKitEnumTypes.h
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2/WebKitVersion.h
+ ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2/WebKitWebProcessEnumTypes.h
${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/webkit2
${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkit2
${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkitdom
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
