[gxml] Changed version from 1.0 to 0.2. Avoids future problems with parallel installations.



commit 1b0fe426d1fe30d9e376d8164471be6bdd3780e7
Author: Daniel Espinosa Ortiz <despinosa git gnome org>
Date:   Tue Dec 20 16:11:27 2011 -0600

    Changed version from 1.0 to 0.2. Avoids future problems with parallel installations.
    
    * Other projects have started using a 1.0 in library and .pc files but at the end you have to release 0.x releases as stable before a 1.0, they can't have parallel installations of 0.6 and 0.8 stable versions because they use the same 1.0 reference. This change avoids future problems in versioning and parallel installations.

 configure.ac                                     |    4 +-
 gxml/Makefile.am                                 |   36 +++++++++++----------
 gxml/{libgxml-1.0.pc.in => libgxmldom-0.2.pc.in} |    2 +-
 3 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3784a8c..7b517a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_CONFIG_MACRO_DIR([m4])
 m4_include(m4/introspection.m4)
 
-AC_INIT(gxml, 1.0)
+AC_INIT(gxml, 0.2)
 
 AC_CONFIG_HEADERS([config.h])
 
@@ -80,7 +80,7 @@ AM_CONDITIONAL(ENABLE_GI_SYSTEM_INSTALL, [test x"$enable_gi_system_install" = "x
 
 AC_OUTPUT([
 Makefile
-gxml/libgxml-1.0.pc
+gxml/libgxmldom-0.2.pc
 gxml/Makefile
 po/Makefile.in])
 
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index 944ec63..70f5e47 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -23,7 +23,7 @@ AM_CFLAGS =\
 	$(VALA_CFLAGS) \
 	$(NULL)
 
-lib_LTLIBRARIES = libgxml.la
+lib_LTLIBRARIES = libgxmldom-0.2.la
 
 VALAFLAGS = \
     $(top_srcdir)/vapi/config.vapi \
@@ -34,7 +34,7 @@ VALAFLAGS = \
     --pkg gio-2.0 \
     $(NULL)
 
-libgxml_la_VALASOURCES = \
+libgxmldom_la_VALASOURCES = \
 	Attr.vala \
 	BackedNode.vala \
 	CDATASection.vala \
@@ -57,20 +57,20 @@ libgxml_la_VALASOURCES = \
 	XNode.vala \
 	$(NULL)
 
-libgxml_la_SOURCES = \
+libgxmldom_0_2_la_SOURCES = \
 	gxml.vala.stamp \
-	$(libgxml_la_VALASOURCES:.vala=.c) \
+	$(libgxmldom_la_VALASOURCES:.vala=.c) \
 	$(NULL)	
 
-gxml-1.0.vapi gxml.vala.stamp GXml-1.0.gir gxml-dom.h: $(libgxml_la_VALASOURCES)
-	$(VALA_COMPILER) $(VALAFLAGS) -C -H $(top_builddir)/gxml/gxml-dom.h --gir=GXmlDom-1.0.gir  --library gxmldom-1.0 $^
+gxmldom-0.2.vapi gxml.vala.stamp GXmlDom-0.2.gir gxml-dom.h: $(libgxmldom_la_VALASOURCES)
+	$(VALA_COMPILER) $(VALAFLAGS) -C -H $(top_builddir)/gxml/gxml-dom.h --gir=GXmlDom-0.2.gir  --library gxmldom-0.2 $^
 	@touch $@
 
 
 
-libgxml_la_LDFLAGS = 
+libgxmldom_0_2_la_LDFLAGS = 
 
-libgxml_la_LIBADD = \
+libgxmldom_0_2_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(LIBXML_LIBS) \
 	$(GIO_LIBS) \
@@ -84,9 +84,9 @@ include_HEADERS = \
 
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgxml-1.0.pc
+pkgconfig_DATA = libgxmldom-0.2.pc
 
-gxmlincludedir=$(includedir)/libgxml-1.0
+gxmlincludedir=$(includedir)/libgxmldom-0.2
 gxmlinclude_HEADERS= gxml-dom.h
 
 # GObject Introspection
@@ -101,24 +101,26 @@ endif
 
 # GIR files are generated automatically by Valac so is not necessary to scan source code to generate it
 INTROSPECTION_GIRS =
-INTROSPECTION_GIRS += GXmlDom-1.0.gir
+INTROSPECTION_GIRS += GXmlDom-0.2.gir
 INTROSPECTION_COMPILER_ARGS = \
     --includedir=.  
 
-GXmlDom-1.0.typelib: $(INTROSPECTION_GIRS)
+GXmlDom-0.2.typelib: $(INTROSPECTION_GIRS)
 	$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS)  $< -o $@
 
 gir_DATA = $(INTROSPECTION_GIRS)
-typelibs_DATA = GXmlDom-1.0.typelib
+typelibs_DATA = GXmlDom-0.2.typelib
 
+vapi: gxmldom-0.2.vapi
 vapidir = $(VALA_VAPIDIR)
-vapi_DATA=gxmldom-1.0.vapi
+vapi_DATA = gxmldom-0.2.vapi
 
-CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA) gxml-1.0.vapi gxml-dom.h
+CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA) gxml-0.2.vapi gxml-dom.h
 
 EXTRA_DIST = \
-	libgxml-1.0.pc.in \
-	$(libgxml_la_VALASOURCES) \
+	libgxmldom-0.2.pc \
+	$(libgxmldom_la_VALASOURCES:.vala=.c) \
+	$(vapi_DATA) \
 	$(typelibs_DATA) \
 	$(INTROSPECTION_GIRS) \
 	gxml.vala.stamp
diff --git a/gxml/libgxml-1.0.pc.in b/gxml/libgxmldom-0.2.pc.in
similarity index 87%
rename from gxml/libgxml-1.0.pc.in
rename to gxml/libgxmldom-0.2.pc.in
index bc7d787..62e07ae 100644
--- a/gxml/libgxml-1.0.pc.in
+++ b/gxml/libgxmldom-0.2.pc.in
@@ -3,7 +3,7 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 datarootdir= datarootdir@
 datadir= datadir@
-includedir= includedir@/libgxml-1.0
+includedir= includedir@/libgxml-0.2
 
 Name: libgxml
 Description: GObject API for XML manipulation library



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]