Changeset 185410 in webkit

Timestamp:

Jun 10, 2015 3:33:13 AM (9 years ago)

Author:

zandobersek@gmail.com

Message:

[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.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -428 +428 @@
     ${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
 )
 
@@ -582 +581 @@
     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
 )