[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 <gns@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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 776a1a72
2013-09-17 Gustavo Noronha Silva <gns@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-17 Timothy Hatcher <timothy@apple.com>
Clean up the Inspector's WebSocket code and prevent it from dropping messages.
......
......@@ -12,9 +12,10 @@ ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml: GNUmakefile \
$(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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment