Title: [156031] releases/WebKitGTK/webkit-2.2/Source/WebInspectorUI
- Revision
- 156031
- Author
- carlo...@webkit.org
- Date
- 2013-09-18 00:52:52 -0700 (Wed, 18 Sep 2013)
Log Message
Merge r156027 - [GTK] Cannot find WebInspectorUI/UserInterface/Main.html referenced in GResourceBundle.xml
https://bugs.webkit.org/show_bug.cgi?id=121405
Patch by Gustavo Noronha Silva <g...@gnome.org> on 2013-09-17
Reviewed by Carlos Garcia Campos.
* GNUmakefile.am: if srcdir == builddir the WebInspectorUI variable that is used both to list
the dependencies of the GResourceBundle and to normalize the paths added to the XML through sed
replacement will end up starting with ./, which would be fine if automake did not remove that
from the paths in the target's dependency. We deal with that by normalizing the path we use to
take that quirk into account.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebInspectorUI/ChangeLog (156030 => 156031)
--- releases/WebKitGTK/webkit-2.2/Source/WebInspectorUI/ChangeLog 2013-09-18 07:38:27 UTC (rev 156030)
+++ releases/WebKitGTK/webkit-2.2/Source/WebInspectorUI/ChangeLog 2013-09-18 07:52:52 UTC (rev 156031)
@@ -1,3 +1,16 @@
+2013-09-17 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] Cannot find WebInspectorUI/UserInterface/Main.html referenced in GResourceBundle.xml
+ https://bugs.webkit.org/show_bug.cgi?id=121405
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: if srcdir == builddir the WebInspectorUI variable that is used both to list
+ the dependencies of the GResourceBundle and to normalize the paths added to the XML through sed
+ replacement will end up starting with ./, which would be fine if automake did not remove that
+ from the paths in the target's dependency. We deal with that by normalizing the path we use to
+ take that quirk into account.
+
2013-09-13 Gustavo Noronha Silva <gustavo.noro...@collabora.com>
[GTK] Move to the new web inspector
Modified: releases/WebKitGTK/webkit-2.2/Source/WebInspectorUI/GNUmakefile.am (156030 => 156031)
--- releases/WebKitGTK/webkit-2.2/Source/WebInspectorUI/GNUmakefile.am 2013-09-18 07:38:27 UTC (rev 156030)
+++ releases/WebKitGTK/webkit-2.2/Source/WebInspectorUI/GNUmakefile.am 2013-09-18 07:52:52 UTC (rev 156031)
@@ -12,9 +12,10 @@
$(AM_V_at)echo '<gresources>' >> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml
$(AM_V_at)echo ' <gresource prefix="/org/webkitgtk/inspector">' >> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml
$(AM_V_at)\
+ basepath=`echo $(WebInspectorUI)/ | sed 's,^./,,g'`; \
for file in $^; do \
if [ "$$file" = "GNUmakefile" ]; then continue; fi; \
- file=`echo $$file | sed s,$(WebInspectorUI)/,,g`; \
+ file=`echo $$file | sed "s,$$basepath,,g"`; \
echo " <file>$$file</file>" >> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml; \
done
$(AM_V_at)echo ' </gresource>' >> ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
