Title: [151901] releases/WebKitGTK/webkit-2.0/Source/WebKit2
- Revision
- 151901
- Author
- [email protected]
- Date
- 2013-06-24 01:44:12 -0700 (Mon, 24 Jun 2013)
Log Message
Merge r148279 - [GTK] Webkit fails to build webkit2gtk-tests-resources.gresource.
https://bugs.webkit.org/show_bug.cgi?id=114485
Patch by Hanyee Kim <[email protected]> on 2013-04-12
Reviewed by Martin Robinson.
Generating webkit2gtk-tests-resources.gresource can be failed due to
the non-existing target directory.
We need to make target directory before generating it.
* UIProcess/API/gtk/tests/GNUmakefile.am:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (151900 => 151901)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-24 08:41:25 UTC (rev 151900)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-24 08:44:12 UTC (rev 151901)
@@ -1,3 +1,16 @@
+2013-04-12 Hanyee Kim <[email protected]>
+
+ [GTK] Webkit fails to build webkit2gtk-tests-resources.gresource.
+ https://bugs.webkit.org/show_bug.cgi?id=114485
+
+ Reviewed by Martin Robinson.
+
+ Generating webkit2gtk-tests-resources.gresource can be failed due to
+ the non-existing target directory.
+ We need to make target directory before generating it.
+
+ * UIProcess/API/gtk/tests/GNUmakefile.am:
+
2013-04-10 Tobias Mueller <[email protected]>
Fixed build failure in Plugin.h: FloatPoint was not in namespace WebCore
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am (151900 => 151901)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2013-06-24 08:41:25 UTC (rev 151900)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am 2013-06-24 08:44:12 UTC (rev 151901)
@@ -67,6 +67,7 @@
-no-fast-install
Programs/resources/webkit2gtk-tests-resources.gresource: Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/Source/WebKit2/UIProcess/API/gtk/tests/resources/webkit2gtk-tests.gresource.xml)
+ $(AM_V_at)mkdir -p ${GENPROGRAMS}/resources
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
DISTCLEANFILES += Programs/resources/webkit2gtk-tests-resources.gresource
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
