[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
xan at webkit.org
xan at webkit.org
Thu Oct 29 20:32:24 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 09f0495f6be4517e58faa8e50a800027c6f67a1e
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 23 12:03:09 2009 +0000
2009-09-23 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
[GTK] We should generate our own gir file for introspection
https://bugs.webkit.org/show_bug.cgi?id=29603
Generate gir and typelib files for WebKit and JSCore. The JSCore
gir file is handwritten (since it's only useful, for now, as a
dependency of the WebKit gir file), the WebKit one is
autogenerated from the headers.
* GNUmakefile.am:
* JSCore-1.0.gir: Added.
* configure.ac:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48670 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 3262edc..ede4fe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2009-09-23 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ [GTK] We should generate our own gir file for introspection
+ https://bugs.webkit.org/show_bug.cgi?id=29603
+
+ Generate gir and typelib files for WebKit and JSCore. The JSCore
+ gir file is handwritten (since it's only useful, for now, as a
+ dependency of the WebKit gir file), the WebKit one is
+ autogenerated from the headers.
+
+ * GNUmakefile.am:
+ * JSCore-1.0.gir: Added.
+ * configure.ac:
+
2009-09-22 Philippe Normand <pnormand at igalia.com>
Reviewed by Xan Lopez.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 23cd7ea..ecb17a3 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -503,6 +503,38 @@ MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+if ENABLE_INTROSPECTION
+JSCORE_GIRSOURCES = JSCore-1.0.gir # JSCore-1.0.gir is handwritten
+WEBKIT_GIRSOURCES = WebKit-1.0.gir
+
+$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
+ $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
+ --add-include-path=$(srcdir) --add-include-path=. \
+ --include=GObject-2.0 \
+ --include=Gtk-2.0 \
+ --include=JSCore-1.0 \
+ --include=Soup-2.4 \
+ --library=webkit-1.0 \
+ --libtool="$(LIBTOOL)" \
+ --pkg gobject-2.0 \
+ --pkg gtk+-2.0 \
+ --pkg webkit-1.0 \
+ --output $@ \
+ $(webkitgtk_h_api)
+
+girdir = $(GIRDIR)
+gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
+
+typelibsdir = $(GIRTYPELIBDIR)
+typelibs_DATA = $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
+
+%.typelib: %.gir $(G_IR_COMPILER)
+ $(AM_V_GEN)$(G_IR_COMPILER) $< -o $@
+
+EXTRA_DIST += $(JSCORE_GIRSOURCES)
+CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
+endif
+
# Include module makefiles
include JavaScriptCore/GNUmakefile.am
include WebCore/GNUmakefile.am
diff --git a/JSCore-1.0.gir b/JSCore-1.0.gir
new file mode 100644
index 0000000..2fb4d46
--- /dev/null
+++ b/JSCore-1.0.gir
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<repository version="1.0"
+ xmlns="http://www.gtk.org/introspection/core/1.0"
+ xmlns:c="http://www.gtk.org/introspection/c/1.0">
+ <namespace name="JSCore" version="1.0" shared-library="webkit-1.0">
+ <alias name="GlobalContextRef"
+ target="none"
+ c:type="JSGlobalContextRef"/>
+ <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
+ <function name="EvaluateScript" c:identifier="JSEvaluateScript">
+ <return-value transfer-ownership="none">
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ </parameters>
+ </function>
+ </namespace>
+</repository>
diff --git a/configure.ac b/configure.ac
index fb93221..1d3c0ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -568,6 +568,40 @@ if test "$enable_jit" = "yes"; then
fi
AC_MSG_RESULT([$enable_jit])
+# GObject Introspection
+AC_MSG_CHECKING([whether to enable GObject introspection support])
+AC_ARG_ENABLE([introspection],
+ [AS_HELP_STRING([--enable-introspection],[Enable GObject introspection (default: disabled)])],
+ [],[enable_introspection=no])
+AC_MSG_RESULT([$enable_introspection])
+
+G_IR_SCANNER=
+G_IR_COMPILER=
+G_IR_GENERATE=
+GIRDIR=
+GIRTYPELIBDIR=
+
+if test "$enable_introspection" = "yes"; then
+ GOBJECT_INTROSPECTION_REQUIRED=0.6.2
+ PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED])
+
+ G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"
+ G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)"
+ G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)"
+ GIRDIR="$($PKG_CONFIG --variable=girdir gobject-introspection-1.0)"
+ GIRTYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+
+ AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support])
+fi
+
+AC_SUBST([G_IR_SCANNER])
+AC_SUBST([G_IR_COMPILER])
+AC_SUBST([G_IR_GENERATE])
+AC_SUBST([GIRDIR])
+AC_SUBST([GIRTYPELIBDIR])
+
+AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
+
# determine the font backend
AC_MSG_CHECKING([the font backend to use])
AC_ARG_WITH(font_backend,
@@ -772,6 +806,7 @@ Features:
Web Workers support : $enable_workers
XPATH support : $enable_xpath
XSLT support : $enable_xslt
+ Introspection support : $enable_introspection
GTK+ configuration:
GDK target : $with_target
Hildon UI extensions : $with_hildon
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list