[GTK] Run forwarding headers generator unconditionally
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Apr 2015 11:46:27 +0000 (11:46 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 16 Apr 2015 11:46:27 +0000 (11:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=143819

Reviewed by Carlos Garcia Campos.

Source/WebKit2:

* PlatformGTK.cmake:

Tools:

* TestWebKitAPI/PlatformGTK.cmake:
* WebKitTestRunner/PlatformGTK.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@182882 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/PlatformGTK.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/PlatformGTK.cmake
Tools/WebKitTestRunner/PlatformGTK.cmake

index 59e57aa..bb4eddd 100644 (file)
@@ -1,3 +1,12 @@
+2015-04-16  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        [GTK] Run forwarding headers generator unconditionally
+        https://bugs.webkit.org/show_bug.cgi?id=143819
+
+        Reviewed by Carlos Garcia Campos.
+
+        * PlatformGTK.cmake:
+
 2015-04-15  Brent Fulgham  <bfulgham@apple.com>
 
         [Mac] Disable "Save to Downloads" option for local files
index e0ef71f..b02e947 100644 (file)
@@ -966,25 +966,8 @@ file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkit2gtk.cfg
     "main_sgml_file=webkit2gtk-docs.sgml\n"
 )
 
-file(GLOB_RECURSE WebKit2_HEADERS
-    *.h
-)
-
-add_custom_command(
-    OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-forwarding-headers.stamp
-    DEPENDS ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl
-            ${WebKit2_SOURCES}
-            ${WebProcess_SOURCES}
-            ${NetworkProcess_SOURCES}
-            ${DatabaseProcess_SOURCES}
-            ${PluginProcessGTK2_SOURCES}
-            ${PluginProcess_SOURCES}
-            ${WebKit2_HEADERS}
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
-    COMMAND touch ${CMAKE_BINARY_DIR}/WebKit2-forwarding-headers.stamp
-)
 add_custom_target(WebKit2-forwarding-headers
-    DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-forwarding-headers.stamp
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT2_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk --platform soup
 )
 
 # These symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
index e9aeac1..5858d70 100644 (file)
@@ -1,3 +1,13 @@
+2015-04-16  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        [GTK] Run forwarding headers generator unconditionally
+        https://bugs.webkit.org/show_bug.cgi?id=143819
+
+        Reviewed by Carlos Garcia Campos.
+
+        * TestWebKitAPI/PlatformGTK.cmake:
+        * WebKitTestRunner/PlatformGTK.cmake:
+
 2015-04-15  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 
         [EFL] Add gnutls to jhbuild.module
index ed9e6ad..951abfe 100644 (file)
@@ -2,6 +2,10 @@
 # disabled and this triggers the inclusion of the WebKit2 headers.
 add_definitions(-DBUILDING_WEBKIT2__)
 
+add_custom_target(TestWebKitAPI-forwarding-headers
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
+)
+
 set(ForwardingHeadersForTestWebKitAPI_NAME TestWebKitAPI-forwarding-headers)
 
 include_directories(
@@ -130,20 +134,3 @@ list(APPEND TestWTF_SOURCES
     ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GMainLoopSource.cpp
     ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GUniquePtr.cpp
 )
-
-file(GLOB_RECURSE TestWebKitAPI_SOURCES
-    *.cpp
-    *.h
-)
-
-add_custom_command(
-    OUTPUT ${CMAKE_BINARY_DIR}/TestWebKitAPI-forwarding-headers.stamp
-    DEPENDS ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl
-            ${TestWebKitAPI_SOURCES}
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${TESTWEBKITAPI_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
-    COMMAND touch ${CMAKE_BINARY_DIR}/TestWebKitAPI-forwarding-headers.stamp
-)
-add_custom_target(TestWebKitAPI-forwarding-headers
-    DEPENDS WebKit2-forwarding-headers
-    DEPENDS ${CMAKE_BINARY_DIR}/TestWebKitAPI-forwarding-headers.stamp
-)
index c8a0160..3c736ea 100644 (file)
@@ -1,3 +1,7 @@
+add_custom_target(WebKitTestRunner-forwarding-headers
+    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
+)
+
 set(ForwardingHeadersForWebKitTestRunner_NAME WebKitTestRunner-forwarding-headers)
 
 list(APPEND WebKitTestRunner_SOURCES
@@ -55,20 +59,3 @@ add_definitions(
     -DFONTS_CONF_DIR="${TOOLS_DIR}/WebKitTestRunner/gtk/fonts"
     -DTOP_LEVEL_DIR="${CMAKE_SOURCE_DIR}"
 )
-
-file(GLOB_RECURSE WebKitTestRunner_HEADERS
-    *.h
-)
-
-add_custom_command(
-    OUTPUT ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
-    DEPENDS ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl
-            ${WebKitTestRunner_SOURCES}
-            ${WebKitTestRunner_HEADERS}
-            ${WebKitTestRunnerInjectedBundle_SOURCES}
-    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform gtk
-    COMMAND touch ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
-)
-add_custom_target(WebKitTestRunner-forwarding-headers
-    DEPENDS ${CMAKE_BINARY_DIR}/WebKitTestRunner-forwarding-headers.stamp
-)