Changeset 161063 in webkit

Timestamp:

Dec 25, 2013 1:53:04 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Missing introspection information for WebExtensions
​https://bugs.webkit.org/show_bug.cgi?id=122407

Reviewed by Philippe Normand.

Generate WebKit2WebExtension-3.0.gir with the WebExtensions API
and move the DOM bindings API from WebKit2-3.0.gir to
WebKit2WebExtension-3.0.gir.

• GNUmakefile.am:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-25  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Missing introspection information for WebExtensions
+        https://bugs.webkit.org/show_bug.cgi?id=122407
+
+        Reviewed by Philippe Normand.
+
+        Generate WebKit2WebExtension-3.0.gir with the WebExtensions API
+        and move the DOM bindings API from WebKit2-3.0.gir to
+        WebKit2WebExtension-3.0.gir.
+
+        * GNUmakefile.am:
+
 2013-12-24  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -319 +319 @@
              -I$(WebKit2) \
              -I$(GENSOURCES) \
-             -I$(GENSOURCES_WEBKITDOM) \
              -I$(GENSOURCES_WEBKIT2) \
              -I$(top_builddir)/Source/WebKit2/UIProcess/API/gtk \
@@ -330 +329 @@
              $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h \
              $(webkit2gtk_h_api) \
-             $(webkitgtk_gdom_built_h_api) \
              $(WebKit2)/UIProcess/API/gtk/*.cpp
 
@@ -338 +336 @@
 gir_DATA += WebKit2-@WEBKITGTK_API_VERSION@.gir
 typelibs_DATA += WebKit2-@WEBKITGTK_API_VERSION@.typelib
-
 CLEANFILES += WebKit2-@WEBKITGTK_API_VERSION@.gir WebKit2-@WEBKITGTK_API_VERSION@.typelib
+
+WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) WebKit2-@WEBKITGTK_API_VERSION@.gir
+        $(AM_V_GEN) \
+             CC="$(CC)" \
+             CFLAGS="$(CFLAGS) -Wno-deprecated-declarations" \
+             $(G_IR_SCANNER) \
+             --quiet \
+             --warn-all \
+             --symbol-prefix=webkit \
+             --identifier-prefix=WebKit \
+             --namespace=WebKit2WebExtension \
+             --nsversion=@WEBKITGTK_API_VERSION@ \
+             --include=GObject-2.0 \
+             --include=Gtk-3.0 \
+             --include=JavaScriptCore-@WEBKITGTK_API_VERSION@ \
+             --include=WebKit2-@WEBKITGTK_API_VERSION@ \
+             --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/webkit-web-extension.h" \
+             -I$(srcdir)/Source \
+             -I$(WebKit2) \
+             -I$(GENSOURCES) \
+             -I$(GENSOURCES_WEBKITDOM) \
+             -I$(GENSOURCES_WEBKIT2) \
+             -I$(top_builddir)/Source/WebKit2/WebProcess/InjectedBundle/API/gtk \
+             -I$(top_srcdir)/Source/JavaScriptCore/ForwardingHeaders \
+             -I$(top_srcdir) \
+             -I$(GENSOURCES_WEBKIT2)/webkit2gtk/include \
+             -I$(GENSOURCES_WEBKIT2)/webkit2extension/include \
+             -I$(GENSOURCES_WEBKIT2)/webkit2gtk \
+             -DBUILDING_WEBKIT \
+             -DWEBKIT2_COMPILATION \
+             $(webkit2_web_extension_h_api) \
+             $(webkitgtk_gdom_built_h_api) \
+             $(WebKit2)/WebProcess/InjectedBundle/API/gtk/*.cpp
+
+WebKit2WebExtension-@WEBKITGTK_API_VERSION@.typelib: WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir $(G_IR_COMPILER)
+        $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(WebKit2) --includedir $(top_builddir) $< -o $@
+
+gir_DATA += WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir
+typelibs_DATA += WebKit2WebExtension-@WEBKITGTK_API_VERSION@.typelib
+CLEANFILES += WebKit2WebExtension-@WEBKITGTK_API_VERSION@.gir WebKit2WebExtension-@WEBKITGTK_API_VERSION@.typelib
 
 endif