Title: [260696] trunk/Source
- Revision
- 260696
- Author
- dp...@igalia.com
- Date
- 2020-04-25 01:56:11 -0700 (Sat, 25 Apr 2020)
Log Message
Source/WebInspectorUI:
REGRESSION(210942): [GTK][WPE] Unreviewed, EWS build bots fail in compile-webkit step
https://bugs.webkit.org/show_bug.cgi?id=211014
* CMakeLists.txt: Remove creation of file 'inspector-resources.stamp'.
Source/WebKit:
REGRESSION(210942): [GTK][WPE] EWS build bots fail in compile-webkit step
https://bugs.webkit.org/show_bug.cgi?id=211014
Make command that generates 'InspectorGResourceBundle.xml' depend on target
WebInspectorUI, instead of file 'inspector-resources.stamp'.
* InspectorGResources.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/CMakeLists.txt (260695 => 260696)
--- trunk/Source/WebInspectorUI/CMakeLists.txt 2020-04-25 08:10:23 UTC (rev 260695)
+++ trunk/Source/WebInspectorUI/CMakeLists.txt 2020-04-25 08:56:11 UTC (rev 260696)
@@ -74,6 +74,5 @@
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
)
Modified: trunk/Source/WebInspectorUI/ChangeLog (260695 => 260696)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-04-25 08:10:23 UTC (rev 260695)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-04-25 08:56:11 UTC (rev 260696)
@@ -1,3 +1,10 @@
+2020-04-25 Diego Pino Garcia <dp...@igalia.com>
+
+ REGRESSION(210942): [GTK][WPE] Unreviewed, EWS build bots fail in compile-webkit step
+ https://bugs.webkit.org/show_bug.cgi?id=211014
+
+ * CMakeLists.txt: Remove creation of file 'inspector-resources.stamp'.
+
2020-04-24 Christopher Reid <chris.r...@sony.com>
[Win] Bundle Inspector Resources in Release builds
Modified: trunk/Source/WebKit/ChangeLog (260695 => 260696)
--- trunk/Source/WebKit/ChangeLog 2020-04-25 08:10:23 UTC (rev 260695)
+++ trunk/Source/WebKit/ChangeLog 2020-04-25 08:56:11 UTC (rev 260696)
@@ -1,3 +1,13 @@
+2020-04-25 Diego Pino Garcia <dp...@igalia.com>
+
+ REGRESSION(210942): [GTK][WPE] EWS build bots fail in compile-webkit step
+ https://bugs.webkit.org/show_bug.cgi?id=211014
+
+ Make command that generates 'InspectorGResourceBundle.xml' depend on target
+ WebInspectorUI, instead of file 'inspector-resources.stamp'.
+
+ * InspectorGResources.cmake:
+
2020-04-24 Diego Pino Garcia <dp...@igalia.com>
[WPE][Debug] Unreviewed, fix build after r260063
Modified: trunk/Source/WebKit/InspectorGResources.cmake (260695 => 260696)
--- trunk/Source/WebKit/InspectorGResources.cmake 2020-04-25 08:10:23 UTC (rev 260695)
+++ trunk/Source/WebKit/InspectorGResources.cmake 2020-04-25 08:56:11 UTC (rev 260696)
@@ -1,7 +1,7 @@
macro(WEBKIT_BUILD_INSPECTOR_GRESOURCES _derived_sources_dir)
add_custom_command(
OUTPUT ${_derived_sources_dir}/InspectorGResourceBundle.xml
- DEPENDS ${CMAKE_BINARY_DIR}/inspector-resources.stamp
+ DEPENDS WebInspectorUI
${TOOLS_DIR}/glib/generate-inspector-gresource-manifest.py
COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/glib/generate-inspector-gresource-manifest.py --input=${_derived_sources_dir}/InspectorResources --output=${_derived_sources_dir}/InspectorGResourceBundle.xml
VERBATIM
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
