On Tue, Jan 22, 2019 at 02:35:08PM +0100, Corentin Noël wrote:
Thanks for the quick review, I addressed the comments but couldn't run `make dist` because of some issue with `libguestfs.pot` while building. So please review it carefully (even if I followed the recommended steps to include Vala support as written here https://wiki.gnome.org/Projects/Vala/UpstreamGuide#Autotools_Integration )
Regards, Corentin
From 2e4414fac2b4432c566b78ca7760abd3354cc684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin.noel@collabora.com> Date: Tue, 22 Jan 2019 13:12:57 +0100 Subject: [PATCH] gobject: Add Vala binding support
--- .gitignore | 1 + configure.ac | 4 ++ gobject/Makefile.am | 17 +++++ gobject/libguestfs-gobject-1.0.deps | 2 + m4/vapigen.m4 | 101 ++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+) create mode 100644 gobject/libguestfs-gobject-1.0.deps create mode 100644 m4/vapigen.m4
diff --git a/.gitignore b/.gitignore index 637bf7765..29d3e3aae 100644 --- a/.gitignore +++ b/.gitignore @@ -339,6 +339,7 @@ Makefile.in /gobject/Guestfs-1.0.gir /gobject/Guestfs-1.0.typelib /gobject/guestfs-gobject.3 +/gobject/libguestfs-gobject-1.0.vapi /gobject/stamp-guestfs-gobject.pod /golang/bindtests.go /golang/examples/guestfs-golang.3 diff --git a/configure.ac b/configure.ac index e18e099b9..dfc7a1af3 100644 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,8 @@ HEADING([Checking for Go]) m4_include([m4/guestfs-golang.m4]) HEADING([Checking for GObject Introspection]) m4_include([m4/guestfs-gobject.m4]) +HEADING([Checking for Vala]) +VAPIGEN_CHECK
dnl virt-v2v, virt-p2v. HEADING([Checking the virt-v2v and virt-p2v dependencies]) @@ -421,6 +423,8 @@ AS_ECHO_N(["gobject bindings .................... "]) if test "x$HAVE_GOBJECT_TRUE" = "x"; then echo "yes"; else echo "no"; fi AS_ECHO_N(["gobject introspection ............... "]) if test "x$HAVE_INTROSPECTION_TRUE" = "x"; then echo "yes"; else echo "no"; fi +AS_ECHO_N(["Vala bindings ....................... "]) +if test "x$ENABLE_VAPIGEN" = "x"; then echo "yes"; else echo "no"; fi AS_ECHO_N(["bash completion ..................... "]) if test "x$HAVE_BASH_COMPLETION_TRUE" = "x"; then echo "yes"; else echo "no"; fi echo diff --git a/gobject/Makefile.am b/gobject/Makefile.am index ddedd5b51..43f490a80 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -105,6 +105,23 @@ $(TESTS): $(typelib_DATA)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
+if ENABLE_VAPIGEN +-include $(VAPIGEN_MAKEFILE) + +libguestfs-gobject-1.0.vapi: Guestfs-1.0.gir libguestfs-gobject- 1.0.deps + +VAPIGEN_VAPIS = libguestfs-gobject-1.0.vapi + +libguestfs_gobject_1_0_vapi_DEPS = gobject-2.0 gio-2.0 +libguestfs_gobject_1_0_vapi_METADATADIRS = $(srcdir) +libguestfs_gobject_1_0_vapi_FILES = Guestfs-1.0.gir + +vapidir = $(datadir)/vala/vapi +vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) + +EXTRA_DIST += libguestfs-gobject-1.0.deps +endif
I still think EXTRA_DIST should be moved outside the if condition.
02110-1301 USA + +# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND_INTROSPECTION], [DEFAULT])
Something in your email client is folding lines. You might want to try using 'git send-email'. Anyway with the EXTRA_DIST change the patch would be good now. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v