GNOME.org
 

[gxml] Released 0.14

commit a8d27fdd90d3c64e2b6a32d159c031f4ffa60a2e
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Mar 9 18:51:31 2017 -0600

    Released 0.14
    
    Improvements on VALAC_CHECK, adding new VALA_PKG_CHECK for other
    projects use.
    
    Fixed make check.

 NEWS                                 |   23 ++++++++-
 configure.ac                         |   17 ++++---
 gxml/DomElement.vala                 |    6 +-
 m4/valac.m4                          |   98 ++++++++++++++++++++--------------
 test/Makefile.am                     |    4 +-
 test/SerializableGeeTreeMapTest.vala |    2 -
 6 files changed, 95 insertions(+), 55 deletions(-)
---
diff --git a/NEWS b/NEWS
index c9278bf..3872972 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,27 @@ Version 0.14
 ===============
 
 * API additions now GXml.Text.str is writable see Bug #779038
+* Fixed running conditions on XParser
+* Vala required version is set to 0.34.6
+* Some documentation additions
+* Build system improvements (Rico Tzschichholz)
+* Removing lot of warnings
+* Simplified GomHashMap using MappeableElement
+* Added new interface MappeableElementPairKey for double key hash collections
+* Added GomHashPairedMap collection using MappeableElementPairKey
+* New GomObject.clean_property_elements() to search and remove redundant
+  nodes of requested property.
+* New GomObject.find_elements() to search and return a list of all child
+  elements of same type.
+* Added documentation on how to define properties removing redundant
+  child nodes.
+* Added --disable-docs switch
+* Renamed IXsdListAttributesGroup, remember this is unstable API
+* Improved VALAC_CHECK and new VALA_PKG_CHECK macros
+* New and updated translations:
+    Updated Brazilian   by Rafael Fontenelle <rafaelff gnome org>
+    Updated Polish      by Piotr Drąg <piotrdrag gmail com>
+    Updated Servian     by Мирослав Николић <miroslavnikolic rocketmail com>
 
 ===============
 Version 0.13.98
@@ -20,7 +41,7 @@ Version 0.13.98
 * New and updated translations:
     Updated Brazilian   by Rafael Fontenelle <rafaelff gnome org>
     Updated Polish      by Piotr Drąg <piotrdrag gmail com>
-    Updated Czech      by Marek Černocký <marek manet cz>
+    Updated Czech       by Marek Černocký <marek manet cz>
 
 ===============
 Version 0.13.90
diff --git a/configure.ac b/configure.ac
index 9aab47c..16cc9c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@
 
 # Release Version
 m4_define([project_major_version], [0])
-m4_define([project_minor_version], [13])
-m4_define([project_micro_version], [98])
+m4_define([project_minor_version], [14])
+m4_define([project_micro_version], [0])
 m4_define([project_nano_version], [0])
 
 # LT_VERSION
@@ -35,7 +35,7 @@ m4_define([project_full_version],
 
 # You should set project_released to one in order to mark this as a released version
 # and to avoid date on version number
-m4_define(project_released, [0])
+m4_define(project_released, [1])
 m4_define([project_maybe_datestamp],
           m4_if(project_released, [1],
                 [], [m4_esyscmd([date +.%Y%m%d | tr -d '\n\r'])]))
@@ -115,12 +115,13 @@ AC_SUBST(GXML_LOCALEDIR)
 # TODO: what do we do about libvala's versioning?  set it back to -0.18 and see what happens when we 
upgraded from Fedora 18 to 19
 
 GLIB_REQUIRED=2.32.0
-VALA_REQUIRED=0.34
-LIBVALA_REQUIRED=0.34
+VALA_REQUIRED=0.34.6
+VALA_API_REQUIRED=
+LIBVALA_REQUIRED=
 GEE_REQUIRED=0.18.0
 LIBXML_REQUIRED=2.7
 GIO_MODULES="gio-2.0 >= 2.16"
-VALADOC_REQUIRED=0.3.1
+VALADOC_REQUIRED=0.30
 
 # Check glib
 PKG_CHECK_MODULES([GLIB],
@@ -129,6 +130,7 @@ PKG_CHECK_MODULES([GLIB],
 
 # Check for vala
 VALAC_CHECK([$VALA_REQUIRED])
+#VALA_PKG_CHECK([$VALA_API_REQUIRED],[$LIBVALA_REQUIRED])
 
 # Check for libgee
 PKG_CHECK_MODULES(GEE, gee-0.8 >= $GEE_REQUIRED)
@@ -174,7 +176,7 @@ if test x$have_valadoc = xyes -a "x$docs" = "xyes"; then
     build_gtkdoc=no
 fi
 fi
-AM_CONDITIONAL([BUILD_GTK_DOCS], [test "x$build_gtkdoc" = "xyes"])
+AM_CONDITIONAL([BUILD_GTK_DOCS], [ test "x$build_gtkdoc" = "xyes"])
 
 build_devhelp=no
 build_mallard_doc=no
@@ -281,4 +283,5 @@ echo "       Gtk-Docs:            ${build_gtkdoc}"
 echo "   Enable Performance Test: $performance"
 echo "   Debug:                   $debug"
 echo "   Platform:                $host"
+echo "   valac:                   $have_vala"
 echo ""
diff --git a/gxml/DomElement.vala b/gxml/DomElement.vala
index ba7eeda..fb0038c 100644
--- a/gxml/DomElement.vala
+++ b/gxml/DomElement.vala
@@ -54,9 +54,9 @@ public interface GXml.DomElement : GLib.Object,
    * as prefix. For default namespaces, use xmlns as name without prefix. Namespace
    * URI will be the one provided as value.
    *
-   * @param namespace, attribute namespace
-   * @param name, a prefixed attribute name or xmlns for default namespace declaration
-   * @param value, a value for the attribute or URI for namespace declaration
+   * @param namespace attribute namespace
+   * @param name a prefixed attribute name or xmlns for default namespace declaration
+   * @param value a value for the attribute or URI for namespace declaration
    */
   public abstract void set_attribute_ns (string? namespace, string name, string value) throws GLib.Error;
   public abstract void remove_attribute (string name);
diff --git a/m4/valac.m4 b/m4/valac.m4
index a66211a..8e6dbd1 100644
--- a/m4/valac.m4
+++ b/m4/valac.m4
@@ -16,67 +16,85 @@ dnl You should have received a copy of the GNU Lesser General Public
 dnl License along with this library; if not, write to the Free Software
 dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
-# VALAC_CHECK([VERSION], [API_VERSION])
+# VALAC_CHECK([VERSION])
 # --------------------------------------
-# Check valac existence and version.
+# Check valac existence, sets VAPIDIR, VAPIDIR_UNVERSIONED and HAVE_VALA
 m4_define([_VALAC_CHECK_INTERNAL],
 [
   AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-  AS_IF([ test "x$2" = "x" ], [
-    AM_PROG_VALAC($1)
-    AS_IF([ test "x$VALAC" = "xno"], [
-      check_prog=no
-      AC_MSG_ERROR([valac is not installed])
-    ], [
-      check_prog=yes
-      AC_MSG_CHECKING([for VALA_API_VERSION])
-      VALA_API_VERSION=`$VALAC --api-version`
-      AC_MSG_RESULT([$VALAC_API_VERSION])
-      AC_MSG_CHECKING([for VAPIDIR])
-      VAPIDIR=$datarootdir/vala-$VALAC_API_VERSION/vapi
-      AC_MSG_RESULT([$VAPIDIR])
-      AC_MSG_CHECKING([for VAPIDIR_UNVERSIONED])
-      VAPIDIR_UNVERSIONED=$datadir/vala/vapi
-      AC_MSG_RESULT([$VAPIDIR_UNVERSIONED])
-    ])
-  ], [
-    AS_IF([ test "x$1" = "x"], [
-        vala_pkg="libvala-$2"
+  AM_PROG_VALAC([$1],[
+    VALA_API_VERSION=`$VALAC --api-version`
+    VAPIDIR=$datarootdir/vala-$VALAC_API_VERSION/vapi
+    VAPIDIR_UNVERSIONED=$datadir/vala/vapi
+    have_vala=yes
+  ],[
+    have_vala=no
+    AC_MSG_WARN([No suitable Vala compiler version found])
+  ])
+  AM_CONDITIONAL([HAVE_VALA],[ test "x$have_vala" = "xyes"])
+  AC_SUBST([VAPIDIR])
+  AC_SUBST([VAPIDIR_UNVERSIONED])
+  AC_SUBST([VALA_API_VERSION])
+])
+
+# _VALAC_PKG_CHECK_INTERNAL([API_VERSION], [PKG_VERSION])
+# --------------------------------------
+m4_define([_VALA_PKG_CHECK_INTERNAL],
+[
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+  AM_PROG_VALAC([$2],[
+    VALA_API_VERSION=`$VALAC --api-version`
+    have_vala=yes
+  ],[
+    have_vala=no
+    AC_MSG_WARN([No suitable Vala compiler version found])
+  ])
+  AS_IF([ test "x$2" = "x"], [
+        vala_pkg="libvala-$1"
       ], [
-        vala_pkg="libvala-$2 >= $1"
+        vala_pkg="libvala-$1 >= $2"
       ])
-        AC_MSG_CHECKING([for $vala_pkg])
-        PKG_CHECK_EXISTS([ $vala_pkg ], [
-        vala_pkg_found=yes
+  PKG_CHECK_EXISTS([ $vala_pkg ], [
+        VAPIDIR=`$PKG_CONFIG --variable=vapidir libvala-$2`
+        VAPIDIR_UNVERSIONED=$vala_datadir/vala/vapi
         VAPIGEN=`$PKG_CONFIG --variable=vapigen libvala-$2`
         VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir libvala-$2`/vala/Makefile.vapigen
-        VAPIDIR=`$PKG_CONFIG --variable=vapidir libvala-$2`
         GEN_INTROSPECT=`$PKG_CONFIG --variable=gen_introspect libvala-$2`
-        vala_datadir=`$PKG_CONFIG --variable=datadir libvala-$2`
-        VAPIDIR_UNVERSIONED=$vala_datadir/vala/vapi
         VALA_GEN_INTROSPECT=`$PKG_CONFIG --variable=vala_gen_introspect libvala-$2`
-      ], [
-            vala_pkg_found=no
-            AC_MSG_ERROR([no package libvala-$2 is installed])
-      ])
-    AC_MSG_RESULT([$vala_pkg_found])
-  ])
-  AC_SUBST([VAPIGEN])
-  AC_SUBST([VAPIGEN_VAPIDIR])
+        vala_datadir=`$PKG_CONFIG --variable=datadir libvala-$2`
+        VALA_API_VERSION=`$VALAC --api-version`
+        have_vala_gen_introspect=yes
+    ], [
+      have_vala_gen_introspect=no
+      AC_MSG_WARN([libvala package not found. You can't generate vala introspection])
+      if test "x$have_vala" = "xyes"; then
+        AC_MSG_WARN([VAPI installation directory is not defined'])
+      fi
+    ])
+  AM_CONDITIONAL([HAVE_VALA],[ test "x$have_vala" = "xyes"])
+  AM_CONDITIONAL([HAVE_VALA_GEN_INTROSPECT],[ test "x$have_vala" = "xyes"])
   AC_SUBST([VAPIDIR])
   AC_SUBST([VAPIDIR_UNVERSIONED])
+  AC_SUBST([VAPIGEN])
+  AC_SUBST([VAPIGEN_VAPIDIR])
   AC_SUBST([VAPIGEN_MAKEFILE])
   AC_SUBST([GEN_INTROSPECT])
   AC_SUBST([VALA_GEN_INTROSPECT])
   AC_SUBST([VALA_API_VERSION])
 ])
 
-dnl Check VAPIGEN
-# VALAC_CHECK([VERSION], [API_VERSION], [DEFAULT])
+# VALAC_CHECK([VERSION])
 # --------------------------------------
-# Check vapigen existence and version.
+# Check valac version existence, vapi installation directory
+# sets VALAC, VAPIDIR, VAPIDIR_UNVERSIONED, VALAC_API_VERSION, HAVE_VALA
 AC_DEFUN([VALAC_CHECK],
 [
   _VALAC_CHECK_INTERNAL($1,$2,$3)
 ]
 )
+# VALA_PKG_CHECK([API_VERSION],[VERSION])
+# Check vala API package and version, sets VALAC, VAPIGEN, VAPIGEN_MAKEFILE
+# VAPIGEN_VAPIDIR, VALA_GEN_INTROSPECT, VALA_API_VERSION and HAVE_VALA
+AC_DEFUN([VALA_PKG_CHECK], [
+  _VALA_PKG_CHECK_INTERNAL($1,$2)
+])
diff --git a/test/Makefile.am b/test/Makefile.am
index 054d3c8..e4383ce 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,7 @@ AM_CFLAGS = \
        $(LIBXML_CFLAGS) \
        $(GIO_CFLAGS) \
        -I$(top_builddir) \
-       -DTEST_DIR=\"$(abs_builddir)\" \
+       -DTEST_DIR=\"$(abs_srcdir)\" \
        -DTEST_SAVE_DIR=\"$(abs_builddir)\" \
        $(NULL)
 
@@ -121,7 +121,7 @@ gxml_test_LDADD = \
        $(GXML_LIBS) \
        $(LIBXML_LIBS) \
        $(GIO_LIBS) \
-       ../gxml/libgxml-0.14.la
+       ../gxml/libgxml-0.14.la \
        $(NULL)
 
 gxml_test_LDFLAGS = $(AM_LDFLAGS)
diff --git a/test/SerializableGeeTreeMapTest.vala b/test/SerializableGeeTreeMapTest.vala
index c80ba3b..af39758 100644
--- a/test/SerializableGeeTreeMapTest.vala
+++ b/test/SerializableGeeTreeMapTest.vala
@@ -308,9 +308,7 @@ class SerializableGeeTreeMapTest : GXmlTest
         assert (r.chapter == "II");
         assert (r.text == "Nothing to say");
       } catch (GLib.Error e) {
-#if DEBUG
         GLib.message ("ERROR: "+e.message);
-#endif
         assert_not_reached ();
       }
     });
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]