Title: [286585] trunk/Source/WebKit
- Revision
- 286585
- Author
- [email protected]
- Date
- 2021-12-06 19:40:42 -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 Don Olmstead.
Build fix. Covered by existing tests
The previous approach of this patch created the links to the header
derived sources into the target webkit2/ folder, which in turn was a
link to <repo>/Source/WebKit/UIProcess/API/gtk. So it ended up
actually creating the links inside the Source directory.
This commit instead links a different webkit2/ folder from the
generated webkit folder for the WebKitGTK/WPE derived sources headers.
* PlatformGTK.cmake:
* PlatformWPE.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (286584 => 286585)
--- trunk/Source/WebKit/ChangeLog 2021-12-07 01:57:44 UTC (rev 286584)
+++ trunk/Source/WebKit/ChangeLog 2021-12-07 03:40:42 UTC (rev 286585)
@@ -1,3 +1,23 @@
+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 Don Olmstead.
+
+ Build fix. Covered by existing tests
+
+ The previous approach of this patch created the links to the header
+ derived sources into the target webkit2/ folder, which in turn was a
+ link to <repo>/Source/WebKit/UIProcess/API/gtk. So it ended up
+ actually creating the links inside the Source directory.
+
+ This commit instead links a different webkit2/ folder from the
+ generated webkit folder for the WebKitGTK/WPE derived sources headers.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+
2021-12-06 Brady Eidson <[email protected]>
webpushd/webpushtool debugging additions
Modified: trunk/Source/WebKit/PlatformGTK.cmake (286584 => 286585)
--- trunk/Source/WebKit/PlatformGTK.cmake 2021-12-07 01:57:44 UTC (rev 286584)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2021-12-07 03:40:42 UTC (rev 286585)
@@ -875,21 +875,11 @@
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
+ OUTPUT ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2
+ DEPENDS ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit
+ COMMAND ln -n -s -f ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit ${WebKit2Gtk_DERIVED_SOURCES_DIR}/webkit2
)
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
@@ -906,9 +896,7 @@
)
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_DERIVED_SOURCES_DIR}/webkit2
${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/webkit2
${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkit2
${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-webextension/webkitdom
Modified: trunk/Source/WebKit/PlatformWPE.cmake (286584 => 286585)
--- trunk/Source/WebKit/PlatformWPE.cmake 2021-12-07 01:57:44 UTC (rev 286584)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2021-12-07 03:40:42 UTC (rev 286585)
@@ -55,6 +55,12 @@
)
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
COMMAND ln -n -s -f ${WEBKIT_DIR}/WebProcess/InjectedBundle/API/wpe ${FORWARDING_HEADERS_WPE_EXTENSION_DIR}/wpe
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
