GNOME.org
 

[gxml] Setting up 0.14 installation

commit 94ebd331a9be89cab5031c6190edf83ee27f6dc9
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Oct 24 23:02:10 2016 -0500

    Setting up 0.14 installation

 NEWS                                      |    3 +-
 configure.ac                              |   14 ++++----
 gxml/Makefile.am                          |   50 ++++++++++++++--------------
 gxml/{gxml-0.12.deps => gxml-0.14.deps}   |    0
 gxml/{gxml-0.12.pc.in => gxml-0.14.pc.in} |    4 +-
 test/Makefile.am                          |    4 +-
 test/XPathTest.vala                       |    2 +-
 7 files changed, 39 insertions(+), 38 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3686a10..cb828c0 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,8 @@
 Version 0.13.0
 ===============
 
-* Added XPath interfaces and implementation based on libxml2
+* Added XPath interfaces and initial implementation based on libxml2
+* Removed old DOM1 implementation on xNode/xDocument
 
 ===============
 Version 0.12.0
diff --git a/configure.ac b/configure.ac
index db020d6..083a4f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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], [12])
+m4_define([project_lt_current], [14])
 m4_define([project_lt_revision], [0])
 m4_define([project_lt_age], [0])
 
@@ -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, [1])
+m4_define(project_released, [0])
 m4_define([project_maybe_datestamp],
           m4_if(project_released, [1],
                 [], [m4_esyscmd([date +.%Y%m%d | tr -d '\n\r'])]))
@@ -93,7 +93,7 @@ AC_SUBST([PROJECT_MAJOR_MINOR_VERSION])
 # - If new versions are compatible with the actual one, just leave this untouched
 # - If new version breaks API change it in order to allow paralled installations
 #   with old versions. Change name of pc files to use a new API too.
-API_VERSION=0.12
+API_VERSION=0.14
 AC_SUBST([API_VERSION])
 
 GXML_VERSION=project_base_version
@@ -115,9 +115,9 @@ 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.26.0
-LIBVALA_REQUIRED=0.26
-GEE_REQUIRED=0.10.5
+VALA_REQUIRED=0.34.0
+LIBVALA_REQUIRED=0.34
+GEE_REQUIRED=0.18.0
 LIBXML_REQUIRED=2.7
 GIO_MODULES="gio-2.0 >= 2.16"
 VALADOC_REQUIRED=0.3.1
@@ -247,7 +247,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, [test x$platform_win32 = xyes])
 AC_CONFIG_FILES([
 Makefile
 gxml/namespace-info.vala
-gxml/gxml-0.12.pc
+gxml/gxml-0.14.pc
 gxml/Makefile
 test/Makefile
 test/test.xml
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index de9c9cf..d18f033 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -1,6 +1,6 @@
 
 # Library to create
-lib_LTLIBRARIES = libgxml-0.12.la
+lib_LTLIBRARIES = libgxml-0.14.la
 
 
 # Empty variable to be added elements later
@@ -88,7 +88,7 @@ sources = \
 AM_VALAFLAGS= \
        --vapidir=$(VAPIDIR) \
        $(ERROR_AM_VALAFLAGS) \
-       --library=gxml-0.12 \
+       --library=gxml-0.14 \
        $(top_srcdir)/vapi/config.vapi \
        $(top_srcdir)/vapi/xlibxml-1.0.vapi \
        --vapidir=. \
@@ -102,7 +102,7 @@ AM_VALAFLAGS= \
        $(NULL)
 
 # library flags
-#libgxml_0_12_la_AM_VALAFLAGS=
+#libgxml_0_14_la_AM_VALAFLAGS=
 
 
 
@@ -144,7 +144,7 @@ AM_VALAFLAGS += \
        -g
 endif
 
-libgxml_0_12_la_LIBADD = \
+libgxml_0_14_la_LIBADD = \
        $(GEE_LIBS) \
        $(GIO_LIBS) \
        $(GLIB_LIBS) \
@@ -152,7 +152,7 @@ libgxml_0_12_la_LIBADD = \
        $(VALA_LIBS) \
        $(NULL)
 
-libgxml_0_12_la_LDFLAGS = \
+libgxml_0_14_la_LDFLAGS = \
        -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"
 
 vala-stamp: $(sources)
@@ -179,26 +179,26 @@ $(sources:.vala=.c): vala-stamp
                fi; \
                fi
 
-libgxml_0_12_la_SOURCES= \
+libgxml_0_14_la_SOURCES= \
        $(sources:.vala=.c) \
        xlibxml.c \
        $(NULL)
 
 # .h header file
-gxml.h: libgxml-0.12.la
+gxml.h: libgxml-0.14.la
 gxmldir= $(includedir)/gxml-$(API_VERSION)/gxml
 gxml_HEADERS = gxml.h xlibxml.h
 
 # .vapi Vala API file
-gxml-0.12.vapi: libgxml-0.12.la
+gxml-0.14.vapi: libgxml-0.14.la
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
-       gxml-0.12.vapi \
-       gxml-0.12.deps \
+       gxml-0.14.vapi \
+       gxml-0.14.deps \
        $(NULL)
 
 # .pc pkg-config file
-pkgconfig_in = gxml-0.12.pc.in
+pkgconfig_in = gxml-0.14.pc.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in:.in=)
 
@@ -219,9 +219,9 @@ 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) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgxml-0.12.la`
+       `$(SED) -nE "s/^dlname='([A-Za-z0-9.+-]+)'/\1/p" libgxml-0.14.la`
 #libgxml_dlname=\
-#      `$(GREP) -e dlname libgxml-0.12.la | $(SED) s/dlname=\'// | $(SED) s/\'//`
+#      `$(GREP) -e dlname libgxml-0.14.la | $(SED) s/dlname=\'// | $(SED) s/\'//`
 
 AM_VALAFLAGS += \
        --gir=GXml-$(API_VERSION).gir
@@ -229,15 +229,15 @@ AM_VALAFLAGS += \
 INTROSPECTION_GIRS = GXml-$(API_VERSION).gir
 INTROSPECTION_COMPILER_ARGS = --includedir=. -l $(libgxml_dlname)
 
-GXml-0.12.gir: libgxml-0.12.la
+GXml-0.14.gir: libgxml-0.14.la
 
-GXml-0.12.typelib: $(INTROSPECTION_GIRS)
+GXml-0.14.typelib: $(INTROSPECTION_GIRS)
        $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS)  $< -o $@
 
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(INTROSPECTION_TYPELIBDIR)
-typelib_DATA = GXml-0.12.typelib
+typelib_DATA = GXml-0.14.typelib
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 
 endif
@@ -246,26 +246,26 @@ if PLATFORM_WIN32
 AM_VALAFLAGS += \
        --symbols=gxml.symbols
 
-libgxml_0_12_la_LDFLAGS += -shared -o libgxml-0.12.dll -no-undefined \
+libgxml_0_14_la_LDFLAGS += -shared -o libgxml-0.14.dll -no-undefined \
        -out-imlib -export-all-symbols -output-def
 
-gxml.symbols: libgxml-0.12.la
+gxml.symbols: libgxml-0.14.la
 
-libgxml-0.12.def: gxml.symbols
+libgxml-0.14.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.12.def
+       | sort) > gxml.def.tmp && mv gxml.def.tmp libgxml-0.14.def
 
-libgxml-0.12.def: libgxml-0.12.la
+libgxml-0.14.def: libgxml-0.14.la
 libgxmldefdir=$(libdir)
-libgxmldef_DATA=libgxml-0.12.def
+libgxmldef_DATA=libgxml-0.14.def
 
 CLEANFILES += \
        gxml.symbols \
-       libgxml-0.12.def
+       libgxml-0.14.def
 
 BUILT_SOURCES += \
-       libgxml-0.12.def
+       libgxml-0.14.def
 
 endif
 
@@ -274,7 +274,7 @@ CLEANFILES += \
        vala-stamp \
        $(pkgconfig_DATA) \
        namespace-info.vala \
-       gxml-0.12.vapi \
+       gxml-0.14.vapi \
        gxml.h
 
 -include $(top_srcdir)/git.mk
diff --git a/gxml/gxml-0.12.deps b/gxml/gxml-0.14.deps
similarity index 100%
rename from gxml/gxml-0.12.deps
rename to gxml/gxml-0.14.deps
diff --git a/gxml/gxml-0.12.pc.in b/gxml/gxml-0.14.pc.in
similarity index 74%
rename from gxml/gxml-0.12.pc.in
rename to gxml/gxml-0.14.pc.in
index 718fa54..9fe9997 100644
--- a/gxml/gxml-0.12.pc.in
+++ b/gxml/gxml-0.14.pc.in
@@ -6,8 +6,8 @@ datadir=@datadir@
 includedir=@includedir@
 
 Name: libgxml
-Description: GObject API for XML manipulation library
-URL: http://live.gnome.org/XML
+Description: GObject API for XML manipulation and serialization library
+URL: http://live.gnome.org/GXml
 Version: @VERSION@
 Requires: glib-2.0 gobject-2.0 gee-0.8 gio-2.0 libxml-2.0
 Libs: -L${libdir} -lgxml-@API_VERSION@
diff --git a/test/Makefile.am b/test/Makefile.am
index 3f0df1e..1f87ee5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -95,7 +95,7 @@ AM_VALAFLAGS = \
        --pkg gio-2.0 \
        --pkg gee-0.8 \
        --pkg posix \
-       --pkg gxml-0.12 \
+       --pkg gxml-0.14 \
        --pkg libxml-2.0 \
        -C \
        -g \
@@ -118,7 +118,7 @@ gxml_test_LDADD = \
        $(GXML_LIBS) \
        $(LIBXML_LIBS) \
        $(GIO_LIBS) \
-       ../gxml/libgxml-0.12.la
+       ../gxml/libgxml-0.14.la
        $(NULL)
 
 gxml_test_LDFLAGS = $(AM_LDFLAGS)
diff --git a/test/XPathTest.vala b/test/XPathTest.vala
index d3de39a..e1034e9 100644
--- a/test/XPathTest.vala
+++ b/test/XPathTest.vala
@@ -37,7 +37,7 @@ class XPathTest : GXmlTest  {
       } else
         document = new GDocument.from_string (BOOKS);
       assert (document != null);
-      var object = (document as XPathContext).evaluate ("/bookstore/book/title");
+      var object = (document as GXml.XPathContext).evaluate ("/bookstore/book/title");
       assert (object.object_type == XPathObjectType.NODESET);
       var array = object.nodeset.to_array();
       assert (array.length == 4);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]