GNOME.org
 

[libgda/LIBGDA_5.2] Expose all Vala related stuff when using --enable-vala

commit bb16615ffeec7f099ece94484439b0212eee2594
Author: Daniel Espinosa <esodan gmail com>
Date:   Sun Sep 30 20:27:28 2018 -0500

    Expose all Vala related stuff when using --enable-vala
    
    * GObject Introspection GIR will be generated if installed
    * --enable-vala will build all Vala bindings, including UI, and Vala written classes (Vala Extensions
    
    If you don't need some of them, you should use:
    
    --disable-instrospection to disable both GIR and all Vala bindings and extensions
    --disable-gdaui-gi, will disable both GIR and Vala bindings just for UI
    --disable-gdaui-vala, will disable all Vala bindings for UI
    --disable-vala-extensions, will disable just Vala extensions classes

 NEWS                        |   5 +
 configure.ac                |  76 ++---
 libgda-ui/Makefile.am       |   9 +-
 libgda-ui/libgdaui-5.0.vapi | 739 --------------------------------------------
 libgda/Makefile.am          |  14 +-
 5 files changed, 54 insertions(+), 789 deletions(-)
---
diff --git a/NEWS b/NEWS
index a7c0bdb99..2aaab44d6 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@
 libgda-5.2.6
  - Fixed compilation on MacOS
  - Improvements to Continuous Integration
+ - All Vala bindings and Vala extensions are built by default using --enable-vala,
+   added --disable* switch to disable some or all of them
+ - Fixes on outdated unit tests
+ - Translations:
+       - es (Daniel Mustieles)
 
 libgda 5.2.5 2018-09-25
  - GdaConnection has removed the use of g_object_weak_*, improving
diff --git a/configure.ac b/configure.ac
index a2d9a8677..36e52fc1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -475,33 +475,25 @@ dnl *********************************
 dnl Check for GObject Introspection
 dnl *********************************
 GOBJECT_INTROSPECTION_CHECK([1.30.0])
-AC_ARG_ENABLE([gda-gi],
-    AS_HELP_STRING([--disable-gda-gi[=@<:@yes/no@:>@]], [Disable GObject Introspection for libgda 
[default=no]]),
-    [disable_gda_gi=yes],[disable_gda_gi=no])
-
-if test "x$found_introspection" != "xyes"
-then
-  disable_gda_gi=yes
-  disable_gdaui_gi=yes
-fi
-
-AM_CONDITIONAL(ENABLE_GDA_GI, [test "x$disable_gda_gi" != "xyes"])
 
 AC_ARG_ENABLE([gdaui-gi],
     AS_HELP_STRING([--disable-gdaui-gi[=@<:@yes/no@:>@]], [Disable GObject Introspection for libgda-ui 
[default=no]]),
     [disable_gdaui_gi=yes],[disable_gdaui_gi=no])
 
-if test "x$disable_gda_gi" = "xyes"
+if test x$found_introspection != xyes
 then
-       disable_gdaui_gi="yes"
+  disable_gda_gi=yes
+  disable_gdaui_gi=yes
 fi
 
-if test "x$have_ui" != "xyes"
+AM_CONDITIONAL(ENABLE_GDA_GI, [test x$disable_gda_gi != xyes])
+
+if test x$have_ui != xyes
 then
-       disable_gdaui_gi="yes"
+       disable_gdaui_gi=yes
 fi
 
-AM_CONDITIONAL(ENABLE_GDAUI_GI, [test "x$disable_gdaui_gi" != "xyes"])
+AM_CONDITIONAL(ENABLE_GDAUI_GI, [test x$disable_gdaui_gi != xyes])
 
 AC_ARG_ENABLE([gi-system-install],
     AS_HELP_STRING([--enable-gi-system-install[=@<:@no/auto/yes@:>@]], [Install GObject Introspection files 
along with system installed files [default=yes]]),
@@ -512,39 +504,49 @@ dnl ******************************
 dnl Check for Vala Compiler
 dnl ******************************
 
+AC_ARG_ENABLE([vala],
+    AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]], [Generate Vala bindings and extensions]),
+    [enable_vala=yes],[enable_vala=no])
+
 AC_PATH_PROG([VALAC], [valac], [no])
 
+if test "x$enable_vala" = "xyes" -a "x$VALAC" = "xno"
+then
+       AC_MSG_NOTICE([Vala's compiler not found, disabling Vala Bindigs and extensions])
+       enable_vala=no
+fi
+
 AC_PATH_PROG(VAPIGEN, [vapigen], [no])
-if test "x$VAPIGEN" = "xno" -a "x$enable_vala" = "xyes"
+
+if test x$VAPIGEN = xno -a x$enable_vala = xyes
 then
-       AC_MSG_ERROR([GDA Vala bindings is requested but vapigen is not found])
+       AC_MSG_NOTICE([vapigen not found, disabling Vala bindings and extensions])
+       enable_vala=no
 fi
-AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$VAPIGEN" != "xno")
+
+AM_CONDITIONAL(ENABLE_VAPIGEN, test x$enable_vala = xyes)
 
 AC_ARG_ENABLE([gdaui-vala],
-    AS_HELP_STRING([--disable-gdaui-vala[=@<:@yes/no@:>@]], [Disable Vala bindings for GDA-UI [default=no]]),
-    [disable_gdaui_vala=$enableval],[disable_gdaui_vala=no])
+    AS_HELP_STRING([--disable-gdaui-vala[=@<:@yes/no@:>@]], [Generate Vala bindings and extensions]),
+    [disable_gdaui_vala=yes],[disable_gdaui_vala=no])
 
-if test "x$enable_vala" = "xyes"
+if test x$enable_vala != xyes -o x$disable_gdaui_gi = xyes -o x$have_ui = xno
 then
-       disable_gdaui_gi="xyes"
+       disable_gdaui_vala=yes
 fi
 
-AM_CONDITIONAL(ENABLE_GDAUI_VALA, test "x$disable_gdaui_vala" != "xyes")
+AM_CONDITIONAL(ENABLE_GDAUI_VALA, test x$disable_gdaui_vala != xyes)
 
 AC_ARG_ENABLE([vala-extensions],
-    AS_HELP_STRING([--enable-vala-extensions[=@<:@no/yes@:>@]], [Enable utility GObject based extensions 
written in Vala [default=no]]),
-    [enable_vala_ext=$enableval],[enable_vala_ext=no])
+    AS_HELP_STRING([--disable-vala-extensions[=@<:@no/yes@:>@]], [Enable utility GObject based extensions 
written in Vala [default=no]]),
+    [disable_vala_ext=yes],[disable_vala_ext=no])
 
-if test "x$enable_vala" = "xyes" -a "x$VALAC" = "xno"
+if test x$enable_vala = xno
 then
-       AC_MSG_ERROR([Vala Bindigs are requested but Vala's compiler is not found])
+       disable_vala_ext=yes
 fi
 
-if test "x$enable_vala" != "xyes" -a "x$enable_vala_ext" = "xyes" -a "x$VALAC" = "xno"
-then
-       AC_MSG_ERROR([Vala Extensions (Utility GObject clases written in Vala) is requested but Vala's 
compiler is not present])
-fi
+AM_CONDITIONAL(ENABLE_VALA_EXTENSIONS, test x$disable_vala_ext != xyes)
 
 dnl Check for libgee
 found_gee="xyes"
@@ -553,13 +555,11 @@ PKG_CHECK_MODULES(GEE, gee-0.8 >= $GEE_REQUIRED,[],found_gee=no)
 AC_SUBST(GEE_CFLAGS)
 AC_SUBST(GEE_LIBS)
 
-if test "x$enable_vala_ext" = "xyes" -a "x$found_gee" = "xno"
+if test "x$disable_vala_ext" != "xyes" -a "x$found_gee" = "xno"
 then
        AC_MSG_ERROR([Vala Extensions (Utility GObject clases written in Vala) is requested but GEE library 
development is not present])
 fi
 
-AM_CONDITIONAL(ENABLE_VALA_EXTENSIONS, test "x$enable_vala_ext" = "xyes")
-
 dnl ******************************
 dnl Checks for libcrypto
 dnl ******************************
@@ -1045,9 +1045,9 @@ echo "   Building libgda GObject Introspection: `if test x$disable_gda_gi != xye
 echo "   Building libgda-ui GObject Introspection: `if test x$disable_gdaui_gi != xyes; then echo yes; else 
echo no; fi`"
 echo "   Building Gtk-Doc: `if test x$enable_gtk_doc != xno; then echo yes; else echo no; fi`"
 echo "   Building Help (GdaBrowser): `if test x$with_gdu != xno; then echo yes; else echo no; fi`"
-echo "   Building GDA Vala Bindings (--enable-vala): `if test x$enable_vala != xyes; then echo no; else echo 
yes; fi`"
-echo "   Building GDA-UI Vala Bindings: `if test x$enable_gdaui_vala != xyes; then echo no; else echo yes; 
fi`"
-echo "   Building Vala Extensions: `if test x$enable_vala_ext != xno; then echo yes; else echo no; fi`"
+echo "   Building GDA Vala Bindings (--enable-vala): `if test x$enable_vala = xno; then echo no; else echo 
yes; fi`"
+echo "   Building GDA-UI Vala Bindings: `if test x$disable_gdaui_vala = xyes; then echo no; else echo yes; 
fi`"
+echo "   Building Vala Extensions: `if test x$disable_vala_ext = xyes; then echo no; else echo yes; fi`"
 echo "   Building Vala Documentation: `if test x$enable_vala_doc != xno; then echo yes; else echo no; fi`"
 echo "   Building Building Libgda's associated tools: `if test x$enable_tools = xyes; then echo yes; else 
echo no; fi`"
 echo "   Compiled providers:"
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index 5403767c5..e66ded111 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -173,6 +173,8 @@ EXTRA_DIST = $(DTD_FILES) \
        gdaui.css \
        gdaui.gresource.xml
 
+DISTCLEANFILES=
+
 if ENABLE_GDAUI_GI
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
@@ -258,11 +260,12 @@ libgdaui-5.0.vapi: Gdaui-5.0.gir
        $(VAPIGEN) --metadatadir=$(top_srcdir)/libgda-ui --vapidir=$(top_srcdir)/libgda 
--girdir=$(top_srcdir)/libgda --library=libgda-ui-5.0 --pkg=libxml-2.0 --pkg=libgda-5.0 --pkg=gio-2.0 
--pkg=atk --pkg=gtk+-3.0 Gdaui-5.0.gir
 
 vapidir = $(VAPIDIR)
-vapi_DATA=libgdaui-5.0.vapi
+vapi_DATA=libgda-ui-5.0.vapi
 
 EXTRA_DIST += \
-       Gdaui-5.0.metadata \
-        $(vapi_DATA)
+       Gdaui-5.0.metadata
+
+CLEANFILES += $(vapi_DATA)
 
 endif
 
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 8fdf4f599..e87331c40 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -360,7 +360,7 @@ endif
 gir_DATA = $(INTROSPECTION_GIRS)
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(typelibs_DATA)
+CLEANFILES += $(typelibs_DATA) $(INTROSPECTION_GIRS)
 endif
 
 if ENABLE_VAPIGEN
@@ -374,15 +374,11 @@ vapidir = $(VAPIDIR)
 vapi_DATA=libgda-5.0.vapi
 
 EXTRA_DIST += \
-       Gda-5.0.metadata \
-        $(vapi_DATA)
-endif
+       Gda-5.0.metadata
+
+CLEANFILES += $(vapi_DATA)
 
-clean-local:
-       @if ! test -d "$(top_srcdir)/.git"; \
-       then \
-               rm -f $(gir_DATA) $(vapi_DATA); \
-       fi
+endif
 
 if ENABLE_VALA_EXTENSIONS
     SUBDIRS+= . data
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]