Changeset 133059 in webkit

Timestamp:

Oct 31, 2012 12:29:17 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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:

Location:

trunk/Source

Files:

• WebKit/gtk/GNUmakefile.am (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/GNUmakefile.am (modified) (1 diff)
• WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (modified) (4 diffs)

trunk/Source/WebKit/gtk/GNUmakefile.am

@@ -330 +330 @@
 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 $@
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -204 +204 @@
 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

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp

@@ -249 +249 @@
  * @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.
  */
@@ -264 +264 @@
  * @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.
  */
@@ -279 +279 @@
  * @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.
  */
@@ -294 +294 @@
  * @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.
  */