Skip to content
Permalink
Browse files
Enable webkit2 introspection
https://bugs.webkit.org/show_bug.cgi?id=94313

Patch by Jesse van den Kieboom <jessevdk@gnome.org> 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:

Canonical link: https://commits.webkit.org/118936@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@133059 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Jesse van den Kieboom authored and webkit-commit-queue committed Oct 31, 2012
1 parent 3ef599b commit 0e35573266aac3182f9d9b988d62a0597f0628b0
Showing 4 changed files with 71 additions and 5 deletions.
@@ -329,7 +329,10 @@ gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
typelibsdir += $(libdir)/girepository-1.0
typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)

%.typelib: %.gir $(G_IR_COMPILER)
WebKit-@WEBKITGTK_API_VERSION@.typelib: WebKit-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@

JSCore-@WEBKITGTK_API_VERSION@.typelib: JSCore-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit) --includedir $(top_builddir) $< -o $@

CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
@@ -1,3 +1,17 @@
2012-10-31 Jesse van den Kieboom <jessevdk@gnome.org>

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 <christophe.dumez@intel.com>

[EFL][WK2] Add Ewk_File_Chooser_Request API
@@ -203,6 +203,55 @@ if ENABLE_WEBKIT2
pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
endif

if ENABLE_INTROSPECTION

WebKit2-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
$(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=javascriptcoregtk-@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/JavaScriptCore/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-@WEBKITGTK_API_VERSION@.gir

typelibs2dir = $(libdir)/girepository-1.0
typelibs2_DATA = WebKit2-@WEBKITGTK_API_VERSION@.typelib

WebKit2-@WEBKITGTK_API_VERSION@.typelib: WebKit2-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit2) --includedir $(top_builddir) $< -o $@

CLEANFILES += WebKit2-@WEBKITGTK_API_VERSION@.gir WebKit2-@WEBKITGTK_API_VERSION@.typelib

endif

# WebKit2 specific variables
forwarding_headers := $(GENSOURCES_WEBKIT2)/include
generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
@@ -248,7 +248,7 @@ guint webkit_back_forward_list_get_length(WebKitBackForwardList* backForwardList
* 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 @@ GList* webkit_back_forward_list_get_back_list(WebKitBackForwardList* backForward
* @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 @@ GList* webkit_back_forward_list_get_back_list_with_limit(WebKitBackForwardList*
* 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 @@ GList* webkit_back_forward_list_get_forward_list(WebKitBackForwardList* backForw
* @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)

0 comments on commit 0e35573

Please sign in to comment.