Title: [260940] trunk/Source/WebInspectorUI
- Revision
- 260940
- Author
- [email protected]
- Date
- 2020-04-30 04:31:50 -0700 (Thu, 30 Apr 2020)
Log Message
[CMake] Don't copy inspector resources in every incremental build
https://bugs.webkit.org/show_bug.cgi?id=211212
Reviewed by Žan Doberšek.
Moving the copy to a custom_command with a stamp so the copy isn't done each build.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/CMakeLists.txt (260939 => 260940)
--- trunk/Source/WebInspectorUI/CMakeLists.txt 2020-04-30 11:23:28 UTC (rev 260939)
+++ trunk/Source/WebInspectorUI/CMakeLists.txt 2020-04-30 11:31:50 UTC (rev 260940)
@@ -1,4 +1,7 @@
+include(WebKitCommon)
+set_property(DIRECTORY . PROPERTY FOLDER "WebInspectorUI")
+
set(InspectorFiles
${WEBINSPECTORUI_DIR}/UserInterface/*.html
${WEBINSPECTORUI_DIR}/UserInterface/Base/*.js
@@ -66,8 +69,8 @@
endif ()
endif ()
-add_custom_target(
- WebInspectorUI
+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/inspector-resources.stamp
DEPENDS ${InspectorFilesDependencies}
${InspectorResourceScripts}
${WebInspectorUI_DERIVED_SOURCES_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
@@ -75,5 +78,11 @@
COMMAND ${CMAKE_COMMAND} -E env "DERIVED_SOURCES_DIR=${WebInspectorUI_DERIVED_SOURCES_DIR}" "SRCROOT=${WEBINSPECTORUI_DIR}" "_javascript_CORE_PRIVATE_HEADERS_DIR=${_javascript_Core_SCRIPTS_DIR}" "TARGET_BUILD_DIR=${WebInspectorUI_RESOURCES_DIR}" "UNLOCALIZED_RESOURCES_FOLDER_PATH=WebInspectorUI" "COMBINE_INSPECTOR_RESOURCES=${COMBINE_INSPECTOR_RESOURCES}" "COMBINE_TEST_RESOURCES=${COMBINE_TEST_RESOURCES}" PYTHON=${PYTHON_EXECUTABLE} ${PERL_EXECUTABLE} ${WEBINSPECTORUI_DIR}/Scripts/copy-user-interface-resources.pl
COMMAND ${CMAKE_COMMAND} -E make_directory ${WebInspectorUI_LOCALIZED_STRINGS_DIR}
COMMAND ${CMAKE_COMMAND} -E copy "${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js" ${WebInspectorUI_LOCALIZED_STRINGS_DIR}/localizedStrings.js
+ COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_BINARY_DIR}/inspector-resources.stamp
VERBATIM
)
+
+add_custom_target(
+ WebInspectorUI
+ DEPENDS ${CMAKE_BINARY_DIR}/inspector-resources.stamp
+)
Modified: trunk/Source/WebInspectorUI/ChangeLog (260939 => 260940)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-04-30 11:23:28 UTC (rev 260939)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-04-30 11:31:50 UTC (rev 260940)
@@ -1,3 +1,14 @@
+2020-04-30 Christopher Reid <[email protected]>
+
+ [CMake] Don't copy inspector resources in every incremental build
+ https://bugs.webkit.org/show_bug.cgi?id=211212
+
+ Reviewed by Žan Doberšek.
+
+ Moving the copy to a custom_command with a stamp so the copy isn't done each build.
+
+ * CMakeLists.txt:
+
2020-04-29 Devin Rousso <[email protected]>
Web Inspector: don't immediately attempt to perform a search whenever the find string changes
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
