Title: [260741] trunk/Source
- Revision
- 260741
- Author
- [email protected]
- Date
- 2020-04-27 00:35:42 -0700 (Mon, 27 Apr 2020)
Log Message
Unreviewed, reverting r260696.
Build fix after r260672, no needed since r260672 is also being reverted.
Reverted changeset:
"REGRESSION(210942): [GTK][WPE] Unreviewed, EWS build bots
fail in compile-webkit step"
https://bugs.webkit.org/show_bug.cgi?id=211014
https://trac.webkit.org/changeset/260696
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/CMakeLists.txt (260740 => 260741)
--- trunk/Source/WebInspectorUI/CMakeLists.txt 2020-04-27 07:04:09 UTC (rev 260740)
+++ trunk/Source/WebInspectorUI/CMakeLists.txt 2020-04-27 07:35:42 UTC (rev 260741)
@@ -75,5 +75,6 @@
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 (260740 => 260741)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-04-27 07:04:09 UTC (rev 260740)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-04-27 07:35:42 UTC (rev 260741)
@@ -1,3 +1,16 @@
+2020-04-27 Diego Pino Garcia <[email protected]>
+
+ Unreviewed, reverting r260696.
+
+ Build fix after r260672, no needed since r260672 is also being reverted.
+
+ Reverted changeset:
+
+ "REGRESSION(210942): [GTK][WPE] Unreviewed, EWS build bots
+ fail in compile-webkit step"
+ https://bugs.webkit.org/show_bug.cgi?id=211014
+ https://trac.webkit.org/changeset/260696
+
2020-04-26 Christopher Reid <[email protected]>
[Win] Fix windows build with MSBuild after 260672
Modified: trunk/Source/WebKit/ChangeLog (260740 => 260741)
--- trunk/Source/WebKit/ChangeLog 2020-04-27 07:04:09 UTC (rev 260740)
+++ trunk/Source/WebKit/ChangeLog 2020-04-27 07:35:42 UTC (rev 260741)
@@ -1,3 +1,16 @@
+2020-04-27 Diego Pino Garcia <[email protected]>
+
+ Unreviewed, reverting r260696.
+
+ Build fix after r260672, no needed since r260672 is also being reverted.
+
+ Reverted changeset:
+
+ "REGRESSION(210942): [GTK][WPE] Unreviewed, EWS build bots
+ fail in compile-webkit step"
+ https://bugs.webkit.org/show_bug.cgi?id=211014
+ https://trac.webkit.org/changeset/260696
+
2020-04-26 Darin Adler <[email protected]>
[Cocoa] stop using out arguments for document attributes when converting to attributed strings
Modified: trunk/Source/WebKit/InspectorGResources.cmake (260740 => 260741)
--- trunk/Source/WebKit/InspectorGResources.cmake 2020-04-27 07:04:09 UTC (rev 260740)
+++ trunk/Source/WebKit/InspectorGResources.cmake 2020-04-27 07:35:42 UTC (rev 260741)
@@ -1,7 +1,7 @@
macro(WEBKIT_BUILD_INSPECTOR_GRESOURCES _derived_sources_dir)
add_custom_command(
OUTPUT ${_derived_sources_dir}/InspectorGResourceBundle.xml
- DEPENDS WebInspectorUI
+ DEPENDS ${CMAKE_BINARY_DIR}/inspector-resources.stamp
${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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
