Changeset 223884 in webkit

Timestamp:

Oct 24, 2017 1:20:03 AM (7 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK][WPE] generate-forwarding-headers.pl should also scan derived sources in WebKit framework
​https://bugs.webkit.org/show_bug.cgi?id=178579

Reviewed by Carlos Garcia Campos.

• PlatformGTK.cmake: When generating forwarding headers, derived sources

should be scanned as well. The DERIVED_SOURCES_WEBKIT_DIR value has to
be passed as an include path to the generate-forward-headers.pl script
to achieve that. This target then also has to depend on all the derived
source files to be generated before this can be performed.

• PlatformWPE.cmake: Ditto.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-24  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK][WPE] generate-forwarding-headers.pl should also scan derived sources in WebKit framework
+        https://bugs.webkit.org/show_bug.cgi?id=178579
+
+        Reviewed by Carlos Garcia Campos.
+
+        * PlatformGTK.cmake: When generating forwarding headers, derived sources
+        should be scanned as well. The DERIVED_SOURCES_WEBKIT_DIR value has to
+        be passed as an include path to the generate-forward-headers.pl script
+        to achieve that. This target then also has to depend on all the derived
+        source files to be generated before this can be performed.
+        * PlatformWPE.cmake: Ditto.
+
 2017-10-23  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebKit/PlatformGTK.cmake

@@ -1304 +1304 @@
 
 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
+    DEPENDS ${WebKit_DERIVED_SOURCES}
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --include-path ${DERIVED_SOURCES_WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
 )
 

trunk/Source/WebKit/PlatformWPE.cmake

@@ -21 +21 @@
 
 add_custom_target(webkitwpe-forwarding-headers
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup
+    DEPENDS ${WebKit_DERIVED_SOURCES}
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_DIR} --include-path ${DERIVED_SOURCES_WEBKIT_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe --platform soup
 )