Changeset 286585 in webkit

Timestamp:

Dec 6, 2021, 7:40:42 PM (5 years ago)

Author:

Lauro Moura

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (2 diffs)
• PlatformWPE.cmake (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-06  Lauro Moura  <lmoura@igalia.com>
+
+        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  <beidson@apple.com>
 

trunk/Source/WebKit/PlatformGTK.cmake

@@ -876 +876 @@
 )
 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
+    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(
@@ -907 +897 @@
 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

trunk/Source/WebKit/PlatformWPE.cmake

@@ -53 +53 @@
     DEPENDS ${WEBKIT_DIR}/UIProcess/API/wpe
     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
 )