[gxml] Improve autotools. Removing warnings.
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Improve autotools. Removing warnings.
- Date: Thu, 2 Mar 2017 17:22:20 +0000 (UTC)
commit 0835c7535685222ec2bf069d3843f37ef8927805
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Mar 2 11:19:52 2017 -0600
Improve autotools. Removing warnings.
configure.ac | 2 +-
gxml/GXmlHashMapAttr.vala | 2 +-
m4/valac.m4 | 58 ++++++++++++++++++++++------------------
test/GomSerializationTest.vala | 1 -
test/Makefile.am | 1 -
5 files changed, 34 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3f393b8..8da1bcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,7 @@ PKG_CHECK_MODULES([GLIB],
gobject-2.0 >= $GLIB_REQUIRED])
# Check for vala
-VALAC_CHECK(0.32)
+VALAC_CHECK([$VALA_REQUIRED])
# Check for libgee
PKG_CHECK_MODULES(GEE, gee-0.8 >= $GEE_REQUIRED)
diff --git a/gxml/GXmlHashMapAttr.vala b/gxml/GXmlHashMapAttr.vala
index aea6770..d0345cb 100644
--- a/gxml/GXmlHashMapAttr.vala
+++ b/gxml/GXmlHashMapAttr.vala
@@ -262,7 +262,7 @@ public class GXml.GHashMapAttr : Gee.AbstractMap<string,GXml.Node>,
throw new GXml.DomError.NO_MODIFICATION_ALLOWED_ERROR (_("Node collection is read only"));
if (_parent is DomElement) {
var a = _parent.attributes.get_named_item (name);
- (_parent as DomElement).set_attribute (name, null);
+ (_parent as GNode).get_internal_node ()->set_prop (name, null);
return a;
}
return null;
diff --git a/m4/valac.m4 b/m4/valac.m4
index f889bef..1448ef0 100644
--- a/m4/valac.m4
+++ b/m4/valac.m4
@@ -29,9 +29,15 @@ m4_define([_VALAC_CHECK_INTERNAL],
AC_MSG_ERROR([valac is not installed])
], [
check_prog=yes
- VALAC_VERSION=`$VALAC --api-version`
- VAPIDIR=$datadir/vala-$VALAC_VERSION/vapi
- VAPIDIR_UNVERSIONED=$datadir/vala-$VALAC_VERSION/vapi
+ AC_MSG_CHECKING([for VALA_API_VERSION])
+ VALAC_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"], [
@@ -39,30 +45,30 @@ m4_define([_VALAC_CHECK_INTERNAL],
], [
vala_pkg="libvala-$2 >= $1"
])
- AC_MSG_CHECKING([for $vala_pkg])
- PKG_CHECK_EXISTS([ $vala_pkg ], [
- vala_pkg_found=yes
- 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_MSG_CHECKING([for $vala_pkg])
+ PKG_CHECK_EXISTS([ $vala_pkg ], [
+ vala_pkg_found=yes
+ 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])
- AC_SUBST([VAPIDIR])
- AC_SUBST([VAPIDIR_UNVERSIONED])
- AC_SUBST([VAPIGEN_MAKEFILE])
- AC_SUBST([GEN_INTROSPECT])
- AC_SUBST([VALA_GEN_INTROSPECT])
- AC_SUBST([VALAC_VERSION])
+ AC_SUBST([VAPIGEN])
+ AC_SUBST([VAPIGEN_VAPIDIR])
+ AC_SUBST([VAPIDIR])
+ AC_SUBST([VAPIDIR_UNVERSIONED])
+ AC_SUBST([VAPIGEN_MAKEFILE])
+ AC_SUBST([GEN_INTROSPECT])
+ AC_SUBST([VALA_GEN_INTROSPECT])
+ AC_SUBST([VALAC_API_VERSION])
])
dnl Check VAPIGEN
diff --git a/test/GomSerializationTest.vala b/test/GomSerializationTest.vala
index 3934acf..855359e 100644
--- a/test/GomSerializationTest.vala
+++ b/test/GomSerializationTest.vala
@@ -1016,7 +1016,6 @@ class GomSerializationTest : GXmlTest {
() => {
try {
double time;
- GomDocument doc;
var f = GLib.File.new_for_path (GXmlTestConfig.TEST_DIR + "/test-collection.xml");
assert (f.query_exists ());
Test.timer_start ();
diff --git a/test/Makefile.am b/test/Makefile.am
index 9fcdd85..f1e86e1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -103,7 +103,6 @@ AM_VALAFLAGS = \
--pkg libxml-2.0 \
-C \
-g \
- -X -DTEST_DIR=$(top_srcdir)/test \
$(NULL)
if DEBUG
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]