[GTK] Web Inspector is broken
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Jun 2015 10:33:13 +0000 (10:33 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Jun 2015 10:33:13 +0000 (10:33 +0000)
https://bugs.webkit.org/show_bug.cgi?id=145836

Reviewed by Carlos Garcia Campos.

* PlatformGTK.cmake: Thread the InspectorBackendCommands.js file as a separate
dependency of InspectorGResourceBundle.xml. It can't be listed under the InspectorFiles
variable and then searched via the CMake glob command because it probably won't exist
at the time the command is run (since it's copied into the specified path), so it won't
be listed among the dependencies at all.

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

Source/WebKit2/ChangeLog
Source/WebKit2/PlatformGTK.cmake

index 2765ca4..761d579 100644 (file)
@@ -1,3 +1,16 @@
+2015-06-10  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Web Inspector is broken
+        https://bugs.webkit.org/show_bug.cgi?id=145836
+
+        Reviewed by Carlos Garcia Campos.
+
+        * PlatformGTK.cmake: Thread the InspectorBackendCommands.js file as a separate
+        dependency of InspectorGResourceBundle.xml. It can't be listed under the InspectorFiles
+        variable and then searched via the CMake glob command because it probably won't exist
+        at the time the command is run (since it's copied into the specified path), so it won't
+        be listed among the dependencies at all.
+
 2015-06-09  Anders Carlsson  <andersca@apple.com>
 
         Fix build.
index 1145887..35a5574 100644 (file)
@@ -427,7 +427,6 @@ set(InspectorFiles
     ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.png
     ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.svg
     ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
-    ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
 )
 
 file(GLOB InspectorFilesDependencies
@@ -581,8 +580,9 @@ add_custom_command(
 add_custom_command(
     OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml
     DEPENDS ${InspectorFilesDependencies}
+            ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
             ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py
-    COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles}
+    COMMAND ${TOOLS_DIR}/gtk/generate-inspector-gresource-manifest.py --output=${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.xml ${InspectorFiles} ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
     VERBATIM
 )