Merge lp:~dobey/couchdb-glib/vapi-build into lp:couchdb-glib

[dobey]

[Rodrigo Moya (rodrigo-moya)]

Can't the test*vala* programs be in the tests/ directory? Apart from that, seems to look ok

review: Needs Information

[Rodrigo Moya (rodrigo-moya)]

This branch just needs the move of the test programs to tests/, so can you please do it Rodney?

[dobey (dobey)]

I talked with the vala devs some more, and I've decided we shouldn't go this route, and simply rely on the gir files all being correct. There are some issues there that need to be fixed as well, so I will propose a branch that includes those fixes instead.

review: Disapprove

Unmerged revisions

266. By dobey on 2011-02-10

Add support for generating Vala bindings

=== modified file '.gitignore'
--- .gitignore	2010-07-16 11:41:54 +0000
+++ .gitignore	2011-02-10 20:01:37 +0000
@@ -9,14 +9,15 @@
 config.status
 config.sub
 configure
-*.deps
-*.libs
+.deps
+.libs
 *.lo
 *.la
 *.o
 *.bak
 *~
 *.pc
+*_vala.stamp
 depcomp
 install-sh
 libtool
@@ -27,8 +28,16 @@
 couchdb-glib/Couchdb-1.0.typelib
 couchdb-glib/couchdb-marshal.c
 couchdb-glib/couchdb-marshal.h
+couchdb-glib/couchdb-glib-1.0.deps
+couchdb-glib/couchdb-glib-1.0.vapi
+couchdb-glib/test-couchdb-glib-vapi
+couchdb-glib/test-couchdb-glib-vapi.c
 desktopcouch-glib/Desktopcouch-1.0.gir
 desktopcouch-glib/Desktopcouch-1.0.typelib
+desktopcouch-glib/desktopcouch-glib-1.0.deps
+desktopcouch-glib/desktopcouch-glib-1.0.vapi
+desktopcouch-glib/test-desktopcouch-glib-vapi
+desktopcouch-glib/test-desktopcouch-glib-vapi.c
 gtk-doc.make
 m4/gtk-doc.m4
 m4/libtool.m4
@@ -81,6 +90,8 @@
 bindings/mono/CouchdbDocumentInfo.cs
 bindings/mono/CouchdbDocumentContact.cs
 bindings/mono/CouchdbDocumentTask.cs
+bindings/mono/CouchdbQuery.cs
+bindings/mono/CouchdbResponse.cs
 bindings/mono/CouchdbSession.cs
 bindings/mono/CouchdbStructField.cs
 bindings/mono/DatabaseCreatedHandler.cs
 
=== modified file 'configure.ac'
--- configure.ac	2010-11-24 15:37:50 +0000
+++ configure.ac	2011-02-10 20:01:37 +0000
@@ -97,6 +97,48 @@
 # Check for introspection
 ##################################################
 GOBJECT_INTROSPECTION_CHECK([0.6.4])
+AC_MSG_CHECKING([if gobject-introspection requires new options])
+$PKG_CONFIG --atleast-version=0.9.4 gobject-introspection-1.0
+new_introspection=$?
+if test "x$new_introspection" = "x0"; then
+   AC_MSG_RESULT([yes])
+else
+   AC_MSG_RESULT([no])
+fi
+AM_CONDITIONAL([HAVE_NEW_INTROSPECTION], [test "x$new_introspection" = "x0"])
+
+# Fix up some junk from GIR
+if test "x$found_introspection" = "xyes"; then
+   INTROSPECTION_GIRDIR_NAME="`basename ${INTROSPECTION_GIRDIR}`"
+   INTROSPECTION_TYPELIBDIR_NAME="`basename ${INTROSPECTION_TYPELIBDIR}`"
+   AC_SUBST(INTROSPECTION_GIRDIR_NAME)
+   AC_SUBST(INTROSPECTION_TYPELIBDIR_NAME)
+fi
+
+##################################################
+# Check for Vala's vapigen
+##################################################
+VAPIGEN=""
+AC_MSG_CHECKING([whether to enable vapi generation])
+AC_ARG_ENABLE([vapigen],
+	AC_HELP_STRING([--disable-vapigen],
+	               [Build the vapi for libsyncdaemon [default=enabled]]),
+	[enable_vapigen=$enableval],
+	[enable_vapigen=yes])
+if test "x$enable_vapigen" = "xyes"; then
+   if test "x$found_introspection" = "xyes"; then
+      AC_MSG_RESULT([yes])
+      AC_PATH_PROG([VAPIGEN], [vapigen], [])
+      AM_PROG_VALAC()
+   else
+      AC_MSG_RESULT([no])
+      AC_MSG_RESULT([gobject-introspection is required to generate a vapi])
+   fi
+else
+   AC_MSG_RESULT([no])
+fi
+AC_SUBST(VAPIGEN)
+AM_CONDITIONAL([HAVE_VAPIGEN], [test "x$VAPIGEN" != "x" -a "x$enable_vapigen" = "xyes"])
 
 AC_OUTPUT([
 Makefile
 
=== modified file 'couchdb-glib/Makefile.am'
--- couchdb-glib/Makefile.am	2010-11-24 15:25:47 +0000
+++ couchdb-glib/Makefile.am	2011-02-10 20:01:37 +0000
@@ -101,9 +101,15 @@
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_SCANNER_ARGS =		\
+	--add-include-path=$(srcdir)	\
+	--c-include="couchdb-glib.h"
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
+if HAVE_NEW_INTROSPECTION
+INTROSPECTION_SCANNER_ARGS += --identifier-prefix=Couchdb --warn-all
+endif
+
 if HAVE_INTROSPECTION
 introspection_files =					\
 	$(h_DATA)					\
@@ -113,6 +119,7 @@
 Couchdb_1_0_gir_CFLAGS = -I$(top_srcdir)/couchdb-glib -I$(top_builddir)/couchdb-glib
 Couchdb_1_0_gir_LIBS = libcouchdb-glib-1.0.la
 Couchdb_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+Couchdb_1_0_gir_EXPORT_PACKAGES = couchdb-glib-1.0
 INTROSPECTION_GIRS += Couchdb-1.0.gir
 
 girdir = $(datadir)/gir-1.0
@@ -122,4 +129,30 @@
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif
+
+if HAVE_VAPIGEN
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = couchdb-glib-1.0.vapi couchdb-glib-1.0.deps
+
+couchdb-glib-1.0.vapi: Couchdb-1.0.gir Makefile
+	$(VAPIGEN) --pkg gobject-2.0 --pkg json-glib-1.0 --library couchdb-glib-1.0 $<
+
+couchdb-glib-1.0.deps: couchdb-glib-vala.deps Makefile
+	cp $< $@
+
+noinst_PROGRAMS = test-couchdb-glib-vapi
+
+test_couchdb_glib_vapi_SOURCES =	\
+	couchdb-glib-1.0.vapi			\
+	test-couchdb-glib-vapi.vala
+
+test_couchdb_glib_vapi_VALAFLAGS =	\
+	--pkg gobject-2.0 --pkg glib-2.0 --pkg json-glib-1.0
+
+test_couchdb_glib_vapi_LDADD = libcouchdb-glib-1.0.la $(COUCHDB_GLIB_LIBS)
+
+CLEANFILES += $(vapi_DATA) $(test_couchdb_glib_vapi_SOURCES:.vala=.c)
+
+endif # HAVE_VAPIGEN
+
+endif # HAVE_INTROSPECTION
 
=== added file 'couchdb-glib/couchdb-glib-vala.deps'
--- couchdb-glib/couchdb-glib-vala.deps	1970-01-01 00:00:00 +0000
+++ couchdb-glib/couchdb-glib-vala.deps	2011-02-10 20:01:37 +0000
@@ -0,0 +1,3 @@
+gobject-2.0
+json-glib-1.0
+
 
=== added file 'couchdb-glib/test-couchdb-glib-vapi.vala'
--- couchdb-glib/test-couchdb-glib-vapi.vala	1970-01-01 00:00:00 +0000
+++ couchdb-glib/test-couchdb-glib-vapi.vala	2011-02-10 20:01:37 +0000
@@ -0,0 +1,51 @@
+/*
+ * Couchdb-GLib Vala API test binary
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *
+ */
+using Couchdb;
+using GLib;
+
+public class TestVapi {
+	private MainLoop loop;
+	private int status;
+
+	public TestVapi () {
+		status = 0;
+	}
+
+	private bool test_instantiation () {
+		new Session ("http://test:test@127.0.0.1:5985");
+
+		loop.quit ();
+		return false;
+	}
+
+	public int main () {
+		loop = new MainLoop ();
+
+		Idle.add ((SourceFunc) test_instantiation);
+		loop.run ();
+
+		return status;
+	}
+}
+
+int main (string[] args) {
+	var test = new TestVapi ();
+	return test.main ();
+}
 
=== modified file 'desktopcouch-glib/Makefile.am'
--- desktopcouch-glib/Makefile.am	2010-11-24 15:26:48 +0000
+++ desktopcouch-glib/Makefile.am	2011-02-10 20:01:37 +0000
@@ -30,9 +30,16 @@
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_srcdir)/couchdb-glib
+INTROSPECTION_SCANNER_ARGS =		\
+	--add-include-path=$(srcdir)	\
+	--add-include-path=$(top_srcdir)/couchdb-glib	\
+	--c-include="desktopcouch-glib.h"
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_builddir)/couchdb-glib
 
+if HAVE_NEW_INTROSPECTION
+INTROSPECTION_SCANNER_ARGS += --identifier-prefix=Desktopcouch --warn-all
+endif
+
 if HAVE_INTROSPECTION
 introspection_files =					\
 	$(h_DATA)					\
@@ -42,6 +49,7 @@
 Desktopcouch_1_0_gir_CFLAGS = -I$(top_srcdir)/desktopcouch-glib -I$(top_builddir)/desktopcouch-glib -I$(top_srcdir)/couchdb-glib -I$(top_builddir)/couchdb-glib
 Desktopcouch_1_0_gir_LIBS = libdesktopcouch-glib-1.0.la
 Desktopcouch_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+Desktopcouch_1_0_gir_EXPORT_PACKAGES = desktopcouch-glib-1.0
 INTROSPECTION_GIRS += Desktopcouch-1.0.gir
 
 girdir = $(datadir)/gir-1.0
@@ -51,4 +59,31 @@
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif
+
+if HAVE_VAPIGEN
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = desktopcouch-glib-1.0.vapi desktopcouch-glib-1.0.deps
+
+desktopcouch-glib-1.0.vapi: Desktopcouch-1.0.gir Makefile
+	$(VAPIGEN) --vapidir=$(top_builddir)/couchdb-glib --pkg gobject-2.0 --pkg json-glib-1.0 --library desktopcouch-glib-1.0 $<
+
+desktopcouch-glib-1.0.deps: desktopcouch-glib-vala.deps Makefile
+	cp $< $@
+
+noinst_PROGRAMS = test-desktopcouch-glib-vapi
+
+test_desktopcouch_glib_vapi_SOURCES =	\
+	desktopcouch-glib-1.0.vapi			\
+	test-desktopcouch-glib-vapi.vala
+
+test_desktopcouch_glib_vapi_VALAFLAGS =	\
+	--vapidir=$(top_builddir)/couchdb-glib	\
+	--pkg gobject-2.0 --pkg glib-2.0 --pkg json-glib-1.0 --pkg couchdb-glib-1.0
+
+test_desktopcouch_glib_vapi_LDADD = libdesktopcouch-glib-1.0.la $(COUCHDB_GLIB_LIBS)
+
+CLEANFILES += $(vapi_DATA) $(test_desktopcouch_glib_vapi_SOURCES:.vala=.c)
+
+endif # HAVE_VAPIGEN
+
+endif # HAVE_INTROSPECTION
 
=== added file 'desktopcouch-glib/desktopcouch-glib-vala.deps'
--- desktopcouch-glib/desktopcouch-glib-vala.deps	1970-01-01 00:00:00 +0000
+++ desktopcouch-glib/desktopcouch-glib-vala.deps	2011-02-10 20:01:37 +0000
@@ -0,0 +1,4 @@
+gobject-2.0
+couchdb-glib-1.0
+json-glib-1.0
+
 
=== added file 'desktopcouch-glib/test-desktopcouch-glib-vapi.vala'
--- desktopcouch-glib/test-desktopcouch-glib-vapi.vala	1970-01-01 00:00:00 +0000
+++ desktopcouch-glib/test-desktopcouch-glib-vapi.vala	2011-02-10 20:01:37 +0000
@@ -0,0 +1,51 @@
+/*
+ * Desktopcouch-GLib Vala API test binary
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *
+ */
+using Desktopcouch;
+using GLib;
+
+public class TestVapi {
+	private MainLoop loop;
+	private int status;
+
+	public TestVapi () {
+		status = 0;
+	}
+
+	private bool test_instantiation () {
+		new Session ();
+
+		loop.quit ();
+		return false;
+	}
+
+	public int main () {
+		loop = new MainLoop ();
+
+		Idle.add ((SourceFunc) test_instantiation);
+		loop.run ();
+
+		return status;
+	}
+}
+
+int main (string[] args) {
+	var test = new TestVapi ();
+	return test.main ();
+}