Title: [133059] trunk/Source
- Revision
- 133059
- Author
- [email protected]
- Date
- 2012-10-31 12:29:17 -0700 (Wed, 31 Oct 2012)
Log Message
Enable webkit2 introspection
https://bugs.webkit.org/show_bug.cgi?id=94313
Patch by Jesse van den Kieboom <[email protected]> on 2012-10-31
Reviewed by Martin Robinson.
This patch enables generation of introspection information for webkit2
in the same was as it is done for webkit. The resulting gir and
typelib file are named WebKit2-3.0.{gir,typelib}.
* GNUmakefile.am:
* UIProcess/API/gtk/WebKitBackForwardList.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (133058 => 133059)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2012-10-31 19:20:37 UTC (rev 133058)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2012-10-31 19:29:17 UTC (rev 133059)
@@ -329,9 +329,12 @@
typelibsdir += $(libdir)/girepository-1.0
typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
-%.typelib: %.gir $(G_IR_COMPILER)
+WebKit-@[email protected]: WebKit-@[email protected] $(G_IR_COMPILER)
$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
+JSCore-@[email protected]: JSCore-@[email protected] $(G_IR_COMPILER)
+ $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@
+
CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
endif
Modified: trunk/Source/WebKit2/ChangeLog (133058 => 133059)
--- trunk/Source/WebKit2/ChangeLog 2012-10-31 19:20:37 UTC (rev 133058)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-31 19:29:17 UTC (rev 133059)
@@ -1,3 +1,17 @@
+2012-10-31 Jesse van den Kieboom <[email protected]>
+
+ Enable webkit2 introspection
+ https://bugs.webkit.org/show_bug.cgi?id=94313
+
+ Reviewed by Martin Robinson.
+
+ This patch enables generation of introspection information for webkit2
+ in the same was as it is done for webkit. The resulting gir and
+ typelib file are named WebKit2-3.0.{gir,typelib}.
+
+ * GNUmakefile.am:
+ * UIProcess/API/gtk/WebKitBackForwardList.cpp:
+
2012-10-31 Christophe Dumez <[email protected]>
[EFL][WK2] Add Ewk_File_Chooser_Request API
Modified: trunk/Source/WebKit2/GNUmakefile.am (133058 => 133059)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-10-31 19:20:37 UTC (rev 133058)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-10-31 19:29:17 UTC (rev 133059)
@@ -203,6 +203,55 @@
pkgconfig_DATA += Source/WebKit2/webkit2gtk-@[email protected]
endif
+if ENABLE_INTROSPECTION
+
+WebKit2-@[email protected]: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+ $(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
+ --symbol-prefix=webkit \
+ --identifier-prefix=WebKit \
+ --namespace=WebKit2 \
+ --nsversion=@WEBKITGTK_API_VERSION@ \
+ --include=GObject-2.0 \
+ --include=Gtk-3.0 \
+ --include=Soup-2.4 \
+ --library=webkit2gtk-@WEBKITGTK_API_VERSION@ \
+ --library=_javascript_coregtk-@WEBKITGTK_API_VERSION@ \
+ --libtool="$(LIBTOOL)" \
+ --pkg=gobject-2.0 \
+ --pkg=gtk+-@GTK_API_VERSION@ \
+ --pkg=libsoup-2.4 \
+ --pkg-export=webkit2gtk-@WEBKITGTK_API_VERSION@ \
+ --output=$@ \
+ --add-include-path=$(WebKit2) \
+ --add-include-path=$(top_builddir) \
+ --c-include="webkit2/webkit2.h" \
+ -I$(srcdir)/Source \
+ -I$(WebKit2) \
+ -I$(GENSOURCES) \
+ -I$(GENSOURCES_WEBKIT2) \
+ -I$(top_builddir)/Source/WebKit2/UIProcess/API/gtk \
+ -I$(top_srcdir)/Source/_javascript_Core/ForwardingHeaders \
+ -I$(top_srcdir) \
+ -I$(GENSOURCES_WEBKIT2)/webkit2gtk/include \
+ -I$(GENSOURCES_WEBKIT2)/webkit2gtk \
+ -DWEBKIT2_COMPILATION \
+ $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h \
+ $(webkit2gtk_h_api) \
+ $(WebKit2)/UIProcess/API/gtk/*.cpp
+
+gir2dir = $(datadir)/gir-1.0
+gir2_DATA = WebKit2-@[email protected]
+
+typelibs2dir = $(libdir)/girepository-1.0
+typelibs2_DATA = WebKit2-@[email protected]
+
+WebKit2-@[email protected]: WebKit2-@[email protected] $(G_IR_COMPILER)
+ $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit2) --includedir $(top_builddir) $< -o $@
+
+CLEANFILES += WebKit2-@[email protected] WebKit2-@[email protected]
+
+endif
+
# WebKit2 specific variables
forwarding_headers := $(GENSOURCES_WEBKIT2)/include
generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (133058 => 133059)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2012-10-31 19:20:37 UTC (rev 133058)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2012-10-31 19:29:17 UTC (rev 133059)
@@ -248,7 +248,7 @@
* webkit_back_forward_list_get_back_list:
* @back_forward_list: a #WebKitBackForwardList
*
- * Returns: (element-type WebKit.BackForwardListItem) (transfer container): a #GList of
+ * Returns: (element-type WebKit2.BackForwardListItem) (transfer container): a #GList of
* items preceding the current item.
*/
GList* webkit_back_forward_list_get_back_list(WebKitBackForwardList* backForwardList)
@@ -263,7 +263,7 @@
* @back_forward_list: a #WebKitBackForwardList
* @limit: the number of items to retrieve
*
- * Returns: (element-type WebKit.BackForwardListItem) (transfer container): a #GList of
+ * Returns: (element-type WebKit2.BackForwardListItem) (transfer container): a #GList of
* items preceding the current item limited by @limit.
*/
GList* webkit_back_forward_list_get_back_list_with_limit(WebKitBackForwardList* backForwardList, guint limit)
@@ -278,7 +278,7 @@
* webkit_back_forward_list_get_forward_list:
* @back_forward_list: a #WebKitBackForwardList
*
- * Returns: (element-type WebKit.BackForwardListItem) (transfer container): a #GList of
+ * Returns: (element-type WebKit2.BackForwardListItem) (transfer container): a #GList of
* items following the current item.
*/
GList* webkit_back_forward_list_get_forward_list(WebKitBackForwardList* backForwardList)
@@ -293,7 +293,7 @@
* @back_forward_list: a #WebKitBackForwardList
* @limit: the number of items to retrieve
*
- * Returns: (element-type WebKit.BackForwardListItem) (transfer container): a #GList of
+ * Returns: (element-type WebKit2.BackForwardListItem) (transfer container): a #GList of
* items following the current item limited by @limit.
*/
GList* webkit_back_forward_list_get_forward_list_with_limit(WebKitBackForwardList* backForwardList, guint limit)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
