gnome-scan r627 - in trunk: . bindings bindings/gi bindings/gir bindings/vapi

[phsadleder svn gnome org]

Author: phsadleder
Date: Tue Nov 11 11:20:35 2008
New Revision: 627
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=627&view=rev

Log:
2008-11-11  Philipp Sadleder <philipp sadleder de>

        * configure.ac:
        * bindings/Makefile.am:
        * bindings/gir/Makefile.am:
        Add preliminary support for the new gobject-introspection framework.
        That allows to make use of introspection once vala supports it.

        * bindings/gi/Makefile.am:
        * bindings/gi/gnome-scan.files:
        * bindings/gi/gnome-scan.gi:
        * bindings/gi/gnome-scan.namespace:
        * bindings/vapi/Makefile.am:
        * bindings/vapi/gnome-scan.deps:
        * bindings/vapi/gnome-scan.metadata:
        * bindings/vapi/gnome-scan.vapi:
        Removed, as building a vapi is obsolete.

        * AUTHORS:
        Add myself.


Added:
   trunk/bindings/gir/
   trunk/bindings/gir/Makefile.am
Removed:
   trunk/bindings/gi/
   trunk/bindings/vapi/
Modified:
   trunk/   (props changed)
   trunk/AUTHORS
   trunk/ChangeLog
   trunk/bindings/Makefile.am
   trunk/configure.ac

Modified: trunk/AUTHORS
==============================================================================
--- trunk/AUTHORS	(original)
+++ trunk/AUTHORS	Tue Nov 11 11:20:35 2008
@@ -1,3 +1,3 @@
 bersace:Ãtienne Bersac <bersace03 laposte net>
 Ross Burton <ross burtonini com>
-
+phsadleder:Philipp Sadleder <philipp sadleder de>

Modified: trunk/bindings/Makefile.am
==============================================================================
--- trunk/bindings/Makefile.am	(original)
+++ trunk/bindings/Makefile.am	Tue Nov 11 11:20:35 2008
@@ -1 +1 @@
-SUBDIRS = gi vapi
+SUBDIRS = gir

Added: trunk/bindings/gir/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/bindings/gir/Makefile.am	Tue Nov 11 11:20:35 2008
@@ -0,0 +1,13 @@
+all: GnomeScan-1.0.gir
+
+GnomeScan-1.0.gir: $(G_IR_SCANNER)
+	$(G_IR_SCANNER) -v --namespace GnomeScan --nsversion=1.0 \
+            --add-include-path=$(srcdir) --add-include-path=\
+	    --include=Gtk-2.0 \
+	    --library-path=$(top_srcdir)/lib/.libs/ \
+            --library=gnomescan \
+            --output $@ \
+	    --pkg gtk+-2.0 \
+            --pkg gnome-scan \
+            -I$(top_srcdir) \
+	    $(top_srcdir)/lib/*.h

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Nov 11 11:20:35 2008
@@ -12,7 +12,7 @@
 AM_PROG_CC_C_O
 
 dnl VALA
-VALA_PROG_VALAC(0.3.1)
+VALA_PROG_VALAC(0.5.1)
 
 GNOME_COMPILE_WARNINGS([maximum])
 
@@ -148,11 +148,14 @@
 GIMP_LIBDIR=`$PKG_CONFIG $pcdv --variable=gimplibdir gimp-2.0`
 AC_SUBST(GIMP_LIBDIR)
 
+# GObject Introspection, required
+PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, [gobject-introspection-1.0])
 
-dnl VAPI
-vapidir=$(pkg-config --variable vapidir vala-1.0)
-AC_SUBST(vapidir)
+G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+AC_SUBST(G_IR_SCANNER)
 
+GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+AC_SUBST(GIRDIR)
 
 AC_OUTPUT([
 	gnome-scan.pc
@@ -166,6 +169,5 @@
 	doc/ref/version.xml
 	data/Makefile
 	bindings/Makefile
-	bindings/gi/Makefile
-	bindings/vapi/Makefile
+	bindings/gir/Makefile
 ])