Title: [185410] trunk/Source/WebKit2
- Revision
- 185410
- Author
- [email protected]
- Date
- 2015-06-10 03:33:13 -0700 (Wed, 10 Jun 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185409 => 185410)
--- trunk/Source/WebKit2/ChangeLog 2015-06-10 10:15:12 UTC (rev 185409)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-10 10:33:13 UTC (rev 185410)
@@ -1,3 +1,16 @@
+2015-06-10 Zan Dobersek <[email protected]>
+
+ [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 <[email protected]>
Fix build.
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (185409 => 185410)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-06-10 10:15:12 UTC (rev 185409)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-06-10 10:33:13 UTC (rev 185410)
@@ -427,7 +427,6 @@
${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(
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
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
