Merge lp:~dobey/ubuntuone-client/drop-vapi into lp:ubuntuone-client

[dobey]

Drop vapi generation support to fix distcheck

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-08-01 18:37:44 +0000
+++ configure.ac	2012-09-17 19:21:22 +0000
@@ -124,7 +124,7 @@
 # Check for gtk-doc.
 ##################################################
 GTK_DOC_CHECK(1.0)
-DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc --disable-gtk-doc-html --disable-rendering --enable-debug"
+DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc --disable-rendering --enable-debug"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
 ##################################################
@@ -149,31 +149,6 @@
    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"])
-
 dnl glib-genmarshal
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 

=== modified file 'libsyncdaemon/Makefile.am'
--- libsyncdaemon/Makefile.am	2011-02-04 19:40:39 +0000
+++ libsyncdaemon/Makefile.am	2012-09-17 19:21:22 +0000
@@ -76,7 +76,6 @@
 
 EXTRA_DIST =				\
 	syncdaemon-marshal.list	\
-	libsyncdaemon-vala.deps	\
 	utils.h					\
 	$(MARSHAL_GENERATED)
 
@@ -112,29 +111,4 @@
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 
-if HAVE_VAPIGEN
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = libsyncdaemon-1.0.vapi libsyncdaemon-1.0.deps
-
-libsyncdaemon-1.0.vapi: Syncdaemon-1.0.gir Makefile
-	$(VAPIGEN) --pkg gobject-2.0 --library libsyncdaemon-1.0 $<
-
-libsyncdaemon-1.0.deps: libsyncdaemon-vala.deps Makefile
-	cp $< $@
-
-noinst_PROGRAMS += test-libsyncdaemon-vapi
-
-test_libsyncdaemon_vapi_SOURCES =	\
-	libsyncdaemon-1.0.vapi			\
-	test-libsyncdaemon-vapi.vala
-
-test_libsyncdaemon_vapi_VALAFLAGS =	\
-	--pkg gobject-2.0 --pkg glib-2.0
-
-test_libsyncdaemon_vapi_LDADD = libsyncdaemon-1.0.la $(DBUS_LIBS)
-
-CLEANFILES += $(vapi_DATA) $(test_libsyncdaemon_vapi_SOURCES:.vala=.c)
-
-endif # HAVE_VAPIGEN
-
 endif # HAVE_INTROSPECTION

=== removed file 'libsyncdaemon/libsyncdaemon-vala.deps'
--- libsyncdaemon/libsyncdaemon-vala.deps	2011-02-01 20:17:31 +0000
+++ libsyncdaemon/libsyncdaemon-vala.deps	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-gobject-2.0
-

=== removed file 'libsyncdaemon/test-libsyncdaemon-vapi.vala'
--- libsyncdaemon/test-libsyncdaemon-vapi.vala	2012-04-09 20:07:05 +0000
+++ libsyncdaemon/test-libsyncdaemon-vapi.vala	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * Syncdaemon Vala API test binary
- *
- * Copyright 2011-2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- *
- */
-using GLib;
-using Syncdaemon;
-
-public class TestVapi {
-	private MainLoop loop;
-	private int status;
-
-	public TestVapi () {
-		status = 0;
-	}
-
-	private bool test_instantiation () {
-		new Daemon ();
-
-		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 ();
-}