GNOME.org
 

[gxml] Set version to 0.6

commit 890c31e8b8ea3af65e28ecb9d569917c24f4cd7a
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Feb 6 12:13:52 2015 -0600

    Set version to 0.6
    
    * Added missing file for test namespace
    * Set all to version 0.6, including pc file

 configure.ac                            |    8 ++--
 gxml/Makefile.am                        |   60 +++++++++++++++---------------
 gxml/{gxml-0.4.deps => gxml-0.6.deps}   |    0
 gxml/{gxml-0.4.pc.in => gxml-0.6.pc.in} |    0
 test/Makefile.am                        |    4 +-
 test/NamespaceTest.vala                 |   35 ++++++++++++++++++
 6 files changed, 71 insertions(+), 36 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c782387..37b7d2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@
 
 # Release Version
 m4_define([project_major_version], [0])
-m4_define([project_minor_version], [4])
-m4_define([project_micro_version], [2])
+m4_define([project_minor_version], [6])
+m4_define([project_micro_version], [0])
 m4_define([project_nano_version], [0])
 
 # LT_VERSION
@@ -21,7 +21,7 @@ m4_define([project_nano_version], [0])
 #     increment current and set revision to 0
 #   If public symbols have been added since last release, increment age
 #   If public symbols have been removed since last release, set age to 0
-m4_define([project_lt_current], [4])
+m4_define([project_lt_current], [6])
 m4_define([project_lt_revision], [0])
 m4_define([project_lt_age], [0])
 
@@ -255,7 +255,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, [test x$platform_win32 = xyes])
 AC_CONFIG_FILES([
 Makefile
 gxml/namespace-info.vala
-gxml/gxml-0.4.pc
+gxml/gxml-0.6.pc
 gxml/Makefile
 test/Makefile
 test/test.xml
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index 4bc36b9..3d514d7 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -8,7 +8,7 @@ AM_VALAFLAGS=
 ### Library
 
 # Library to create
-lib_LTLIBRARIES = libgxml-0.4.la
+lib_LTLIBRARIES = libgxml-0.6.la
 
 # Vala source code
 sources = \
@@ -80,7 +80,7 @@ endif
 # library flags
 AM_VALAFLAGS += \
        $(ERROR_VALAFLAGS) \
-       --library=gxml-0.4 \
+       --library=gxml-0.6 \
        $(top_srcdir)/vapi/config.vapi \
        --vapidir=. \
        --vapidir=$(top_srcdir)/vapi \
@@ -89,12 +89,12 @@ AM_VALAFLAGS += \
        --pkg gobject-2.0 \
        --pkg gio-2.0 \
        --includedir gxml \
-       --vapi gxml-0.4.vapi \
+       --vapi gxml-0.6.vapi \
        -H gxml.h \
        -C \
        $(NULL)
 
-libgxml_0_4_la_LIBADD = \
+libgxml_0_6_la_LIBADD = \
        $(GEE_LIBS) \
        $(GIO_LIBS) \
        $(GLIB_LIBS) \
@@ -102,32 +102,32 @@ libgxml_0_4_la_LIBADD = \
        $(VALA_LIBS) \
        $(NULL)
 
-libgxml_0_4_la_LDFLAGS = \
+libgxml_0_6_la_LDFLAGS = \
        -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"
 
-gxml_0_4_la_vala.stamp: $(sources)
+gxml_0_6_la_vala.stamp: $(sources)
        $(VALAC) $(AM_VALAFLAGS) $^
 
-$(sources:.vala=.c): gxml_0_4_la_vala.stamp
+$(sources:.vala=.c): gxml_0_6_la_vala.stamp
 
-libgxml_0_4_la_SOURCES=$(sources:.vala=.c)
-libgxml_0_4_la_DEPENDENCIES= gxml_0_4_la_vala.stamp
+libgxml_0_6_la_SOURCES=$(sources:.vala=.c)
+libgxml_0_6_la_DEPENDENCIES= gxml_0_6_la_vala.stamp
 
 # .h header file
-gxml.h: gxml_0_4_la_vala.stamp
+gxml.h: gxml_0_6_la_vala.stamp
 gxmldir= $(includedir)/gxml-$(API_VERSION)/gxml
 gxml_HEADERS = gxml.h
 
 # .vapi Vala API file
-gxml-0.4.vapi: gxml_0_4_la_vala.stamp
+gxml-0.6.vapi: gxml_0_6_la_vala.stamp
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
-       gxml-0.4.vapi \
-       gxml-0.4.deps \
+       gxml-0.6.vapi \
+       gxml-0.6.deps \
        $(NULL)
 
 # .pc pkg-config file
-pkgconfig_in = gxml-0.4.pc.in
+pkgconfig_in = gxml-0.6.pc.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in:.in=)
 
@@ -138,14 +138,14 @@ EXTRA_DIST = \
 
 GITIGNOREFILES = \
        $(sources:.vala=.c) \
-       libgxml_0_4_la_vala.stamp \
+       libgxml_0_6_la_vala.stamp \
        $(NULL)
 
 
 BUILT_SOURCES += \
-       gxml_0_4_la_vala.stamp \
+       gxml_0_6_la_vala.stamp \
        gxml.h \
-       gxml-0.4.vapi \
+       gxml-0.6.vapi \
        $(NULL)
 
 
@@ -157,7 +157,7 @@ if HAVE_INTROSPECTION
 #   Extract our dlname like libfolks does, see bgo#658002 and bgo#585116
 #   This is what g-ir-scanner does.
 libgxml_dlname = \
-        `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libgxml-0.4.la`
+        `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libgxml-0.6.la`
 
 
 AM_VALAFLAGS += \
@@ -166,15 +166,15 @@ AM_VALAFLAGS += \
 INTROSPECTION_GIRS = GXml-$(API_VERSION).gir
 INTROSPECTION_COMPILER_ARGS = --includedir=. -l $(libgxml_dlname)
 
-GXml-0.4.gir: libgxml-0.4.la
+GXml-0.6.gir: libgxml-0.6.la
 
-GXml-0.4.typelib: $(INTROSPECTION_GIRS)
+GXml-0.6.typelib: $(INTROSPECTION_GIRS)
        $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS)  $< -o $@
 
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(INTROSPECTION_TYPELIBDIR)
-typelib_DATA = GXml-0.4.typelib
+typelib_DATA = GXml-0.6.typelib
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 
 endif
@@ -183,26 +183,26 @@ if PLATFORM_WIN32
 AM_VALAFLAGS += \
        --symbols=gxml.symbols
 
-libgxml_0_4_la_LDFLAGS += -shared -o libgxml-0.4.dll -no-undefined \
+libgxml_0_6_la_LDFLAGS += -shared -o libgxml-0.6.dll -no-undefined \
        -out-imlib -export-all-symbols -output-def
 
-gxml.symbols: gxml_0_4_la_vala.stamp
+gxml.symbols: gxml_0_6_la_vala.stamp
 
-libgxml-0.4.def: gxml.symbols
+libgxml-0.6.def: gxml.symbols
        (echo -e EXPRTS; $(CPP) -P $(DEF_FLAGS) \
        - <$^ | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' \
-       | sort) > gxml.def.tmp && mv gxml.def.tmp libgxml-0.4.def
+       | sort) > gxml.def.tmp && mv gxml.def.tmp libgxml-0.6.def
 
-libgxml-0.4.def: libgxml-0.4.la
+libgxml-0.6.def: libgxml-0.6.la
 libgxmldefdir=$(libdir)
-libgxmldef_DATA=libgxml-0.4.def
+libgxmldef_DATA=libgxml-0.6.def
 
 CLEANFILES += \
        gxml.symbols \
-       libgxml-0.4.def
+       libgxml-0.6.def
 
 BUILT_SOURCES += \
-       libgxml-0.4.def
+       libgxml-0.6.def
 
 endif
 
@@ -210,6 +210,6 @@ CLEANFILES += \
        $(pkgconfig_DATA) \
        namespace-info.vala \
        $(sources:.vala=.c) \
-       gxml-0.4.vapi \
+       gxml-0.6.vapi \
        gxml.h
 
diff --git a/gxml/gxml-0.4.deps b/gxml/gxml-0.6.deps
similarity index 100%
rename from gxml/gxml-0.4.deps
rename to gxml/gxml-0.6.deps
diff --git a/gxml/gxml-0.4.pc.in b/gxml/gxml-0.6.pc.in
similarity index 100%
rename from gxml/gxml-0.4.pc.in
rename to gxml/gxml-0.6.pc.in
diff --git a/test/Makefile.am b/test/Makefile.am
index e628b10..0045ff6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -63,7 +63,7 @@ AM_VALAFLAGS = \
        --pkg gio-2.0 \
        --pkg gee-0.8 \
        --pkg posix \
-       --pkg gxml-0.4 \
+       --pkg gxml-0.6 \
        --pkg libxml-2.0 \
        -C \
        -g \
@@ -77,7 +77,7 @@ gxml_test_LDADD = \
        $(GXML_LIBS) \
        $(LIBXML_LIBS) \
        $(GIO_LIBS) \
-       ../gxml/libgxml-0.4.la
+       ../gxml/libgxml-0.6.la
        $(NULL)
 
 gxml_test_LDFLAGS = $(AM_LDFLAGS)
diff --git a/test/NamespaceTest.vala b/test/NamespaceTest.vala
new file mode 100644
index 0000000..6258be1
--- /dev/null
+++ b/test/NamespaceTest.vala
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2015, Daniel Espinosa <esodan gmail com>
+ *
+ */
+
+using GXml;
+
+class NamespaceTest : GXmlTest {
+
+       public static void add_tests () {
+               Test.add_func ("/gxml/domnode/namespace", () => {
+                 var d = new Document ();
+                 var e = d.create_element ("root");
+                 e.add_namespace_attr ("http://www.gnome.org/GXml";, "gxml");
+                 e.add_namespace_attr ("http://www.gnome.org/GXmlSerializable";, "gxmls");
+                 d.append_child (e);
+                 assert (e.to_string () == "<root xmlns:gxml=\"http://www.gnome.org/GXml\"; 
xmlns:gxmls=\"http://www.gnome.org/GXmlSerializable\"/>");
+                 assert (e.set_namespace ("http://www.gnome.org/GXml";, "gxml"));
+                 assert (e.to_string () == "<gxml:root xmlns:gxml=\"http://www.gnome.org/GXml\"; 
xmlns:gxmls=\"http://www.gnome.org/GXmlSerializable\"/>");
+                 var c = d.create_element ("child");
+                 e.append_child (c);
+                 assert (c.set_namespace ("http://www.gnome.org/GXml";, "gxml"));
+                 assert (c.to_string () == "<gxml:child/>");
+                 var c2 = d.create_element ("subchild");
+                 e.append_child (c2);
+                 assert (c2.set_namespace ("http://www.gnome.org/GXmlSerializable";, "gxmls"));
+                 assert (c2.to_string () == "<gxmls:subchild/>");
+                 var c3 = d.create_element ("testnode");
+                 // Check if an Element with no namespaces will not fail and go to root
+                 e.append_child (c3);
+                 c3.set_namespace ("http://www.gnome.org/GXml";, "gxml");
+                 assert (c3.to_string () == "<gxml:testnode/>");
+               });
+       }
+}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]