Changeset 286549 in webkit

Timestamp:

Dec 6, 2021, 10:40:13 AM (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 Ž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.

Location:

trunk/Source/WebKit

Files:

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

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 Ž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  <achristensen@webkit.org>
 

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
+)
+add_custom_command(
     OUTPUT ${WebKit2Gtk_FRAMEWORK_HEADERS_DIR}/webkit2gtk-${WEBKITGTK_API_VERSION}/webkit2
     DEPENDS ${WEBKIT_DIR}/UIProcess/API/gtk${GTK_API_VERSION}
@@ -892 +907 @@
 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