[gxml] * increase version to 0.3
- From: Richard Hans Schwarting <rschwart src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] * increase version to 0.3
- Date: Mon, 20 Aug 2012 21:59:56 +0000 (UTC)
commit 383d5117b243ee36afac6f6bb49ffe9e91da1777
Author: Richard Schwarting <aquarichy gmail com>
Date: Mon Aug 20 17:59:35 2012 -0400
* increase version to 0.3
configure.ac | 2 +-
gxml/Attr.vala | 2 +-
gxml/Makefile.am | 28 +++++-----
gxml/Serializable.vala | 1 -
gxml/Serialization.vala | 1 -
test/Makefile.am | 125 +----------------------------------------------
waf | Bin 87377 -> 0 bytes
wscript | 48 ------------------
8 files changed, 18 insertions(+), 189 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bb232e5..b1b36c9 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, 0.2)
+AC_INIT(gxml, 0.3)
AC_CONFIG_HEADERS([config.h])
diff --git a/gxml/Attr.vala b/gxml/Attr.vala
index 29b84be..e0f270d 100644
--- a/gxml/Attr.vala
+++ b/gxml/Attr.vala
@@ -12,7 +12,7 @@
/* NOTE: figure out how entity references work with Attrs */
/* NOTE: value as children nodes: can contain Text and EntityReferences */
-[CCode (gir_namespace = "GXml", gir_version = "0.2")]
+[CCode (gir_namespace = "GXml", gir_version = "0.3")]
namespace GXml {
/**
* Represents an XML Attr node, a name=value pair.
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index 6ff329d..eb24c39 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -23,7 +23,7 @@ AM_CFLAGS =\
$(VALA_CFLAGS) \
$(NULL)
-lib_LTLIBRARIES = libgxml-0.2.la
+lib_LTLIBRARIES = libgxml.la
VALAFLAGS = \
$(top_srcdir)/vapi/config.vapi \
@@ -59,20 +59,20 @@ libgxml_la_VALASOURCES = \
Serialization.vala \
$(NULL)
-libgxml_0_2_la_SOURCES = \
+libgxml_la_SOURCES = \
gxml.vala.stamp \
$(libgxml_la_VALASOURCES:.vala=.c) \
$(NULL)
-gxml-0.2.vapi gxml.vala.stamp GXml-0.2.gir gxml.h: $(libgxml_la_VALASOURCES)
- $(VALA_COMPILER) $(VALAFLAGS) -C -H $(top_builddir)/gxml/gxml.h --gir=GXml-0.2.gir --library gxml-0.2 $^
+gxml-$(VERSION).vapi gxml.vala.stamp GXml-$(VERSION).gir gxml.h: $(libgxml_la_VALASOURCES)
+ $(VALA_COMPILER) $(VALAFLAGS) -C -H $(top_builddir)/gxml/gxml.h --gir=GXml-$(VERSION).gir --library gxml-$(VERSION) $^
@touch $@
-libgxml_0_2_la_LDFLAGS =
+libgxml_la_LDFLAGS =
-libgxml_0_2_la_LIBADD = \
+libgxml_la_LIBADD = \
$(GLIB_LIBS) \
$(LIBXML_LIBS) \
$(GIO_LIBS) \
@@ -88,7 +88,7 @@ include_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgxml.pc
-gxmlincludedir=$(includedir)/libgxml-0.2
+gxmlincludedir=$(includedir)/libgxml-$(VERSION)
gxmlinclude_HEADERS= gxml.h
# GObject Introspection
@@ -103,24 +103,24 @@ endif
# GIR files are generated automatically by Valac so is not necessary to scan source code to generate it
INTROSPECTION_GIRS =
-INTROSPECTION_GIRS += GXml-0.2.gir
+INTROSPECTION_GIRS += GXml-$(VERSION).gir
INTROSPECTION_COMPILER_ARGS = \
--includedir=.
-GXml-0.2.typelib: $(INTROSPECTION_GIRS)
+gxml-$(VERSION).typelib: $(INTROSPECTION_GIRS)
$(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
gir_DATA = $(INTROSPECTION_GIRS)
-typelibs_DATA = GXml-0.2.typelib
+typelibs_DATA = gxml-$(VERSION).typelib
-vapi: gxml-0.2.vapi
+vapi: gxml-$(VERSION).vapi
vapidir = $(VALA_VAPIDIR)
-vapi_DATA = gxml-0.2.vapi
+vapi_DATA = gxml-$(VERSION).vapi
-CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA) gxml-0.2.vapi gxml.h
+CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA) gxml-$(VERSION).vapi gxml.h
EXTRA_DIST = \
- libgxml-0.2.pc \
+ libgxml.pc \
$(libgxml_la_VALASOURCES:.vala=.c) \
$(vapi_DATA) \
$(typelibs_DATA) \
diff --git a/gxml/Serializable.vala b/gxml/Serializable.vala
index c92f9d8..268c924 100644
--- a/gxml/Serializable.vala
+++ b/gxml/Serializable.vala
@@ -28,7 +28,6 @@
using GXml;
-[CCode (gir_namespace = "GXml", gir_version = "0.2")]
namespace GXml {
/**
* Interface allowing implementors direct control over serialisation of properties and other data
diff --git a/gxml/Serialization.vala b/gxml/Serialization.vala
index 79ae485..fdc70d4 100644
--- a/gxml/Serialization.vala
+++ b/gxml/Serialization.vala
@@ -25,7 +25,6 @@
using GXml;
-[CCode (gir_namespace = "GXml", gir_version = "0.2")]
namespace GXml {
/**
* Errors from { link Serialization}.
diff --git a/test/Makefile.am b/test/Makefile.am
index ca69cf2..ebd2023 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,19 +1,5 @@
include $(top_srcdir)/gtester.mk
-# gio-2.0 gxml gee-0.8 posix
-# GTK GLIB GEE XML
-# gxml_test
-# gxml
-# vapi_dirs = ../gxml ../vapi
-
-# INCLUDES = \
-# -I$(top_srcdir)/ \
-# -I$(top_srcdir)/gxml
-# $(LIBXML_CFLAGS)
-#
-# LIBS = \
-# $(top_builddir)/gxml/libgxml-0.2.la
-
NULL =
@@ -48,7 +34,7 @@ VALAFLAGS = \
--pkg gio-2.0 \
--pkg gee-0.8 \
--pkg posix \
- --pkg gxml-0.2 \
+ --pkg gxml-0.3 \
--pkg libxml-2.0 \
$(NULL)
@@ -79,7 +65,7 @@ gxml_test_LDFLAGS =
gxml_test_LDADD = \
$(GLIB_LIBS) \
$(GXML_LIBS) \
- -L$(top_srcdir)/gxml -lgxml-0.2 \
+ -L$(top_srcdir)/gxml -lgxml \
$(NULL)
#gxml_test_LIBADD = \
@@ -96,110 +82,3 @@ CLEANFILES += gxml_test
EXTRA_DIST += \
$(NULL)
-
-
-#
-#
-#
-#
-# NULL =
-#
-#
-# AM_CPPFLAGS = \
-# -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-# -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-# -DPACKAGE_DATA_DIR=\""$(datadir)"\"
-#
-# BUILT_SOURCES = gxml.vala.stamp
-# CLEANFILES = gxml.vala.stamp
-#
-# AM_CFLAGS =\
-# -Wall\
-# -g \
-# $(GLIB_CFLAGS) \
-# $(LIBXML_CFLAGS) \
-# $(GIO_CFLAGS) \
-# $(GEE_CFLAGS) \
-# $(VALA_CFLAGS) \
-# $(NULL)
-#
-# lib_LTLIBRARIES = libgxmldom-0.2.la
-#
-# VALAFLAGS = \
-# $(top_srcdir)/vapi/config.vapi \
-# --vapidir=$(top_srcdir)/vapi \
-# --pkg libxml-2.0 \
-# --pkg gee-0.8 \
-# --pkg gobject-2.0 \
-# --pkg gio-2.0 \
-# $(NULL)
-#
-#
-# libgxmldom_0_2_la_SOURCES = \
-# gxml.vala.stamp \
-# $(libgxmldom_la_VALASOURCES:.vala=.c) \
-# $(NULL)
-#
-# 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 $@
-#
-#
-#
-# libgxmldom_0_2_la_LDFLAGS =
-#
-# libgxmldom_0_2_la_LIBADD = \
-# $(GLIB_LIBS) \
-# $(LIBXML_LIBS) \
-# $(GIO_LIBS) \
-# $(GEE_LIBS) \
-# $(VALA_LIBS) \
-# $(NULL)
-#
-# include_HEADERS = \
-# $(top_builddir)/gxml/gxml-dom.h \
-# $(NULL)
-#
-#
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = libgxmldom-0.2.pc
-#
-# gxmlincludedir=$(includedir)/libgxmldom-0.2
-# gxmlinclude_HEADERS= gxml-dom.h
-#
-# # GObject Introspection
-#
-# if ENABLE_GI_SYSTEM_INSTALL
-# girdir = $(INTROSPECTION_GIRDIR)
-# typelibsdir = $(INTROSPECTION_TYPELIBDIR)
-# else
-# girdir = $(datadir)/gir-1.0
-# typelibsdir = $(libdir)/girepository-1.0
-# endif
-#
-# # GIR files are generated automatically by Valac so is not necessary to scan source code to generate it
-# INTROSPECTION_GIRS =
-# INTROSPECTION_GIRS += GXmlDom-0.2.gir
-# INTROSPECTION_COMPILER_ARGS = \
-# --includedir=.
-#
-# GXmlDom-0.2.typelib: $(INTROSPECTION_GIRS)
-# $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
-#
-# gir_DATA = $(INTROSPECTION_GIRS)
-# typelibs_DATA = GXmlDom-0.2.typelib
-#
-# vapi: gxmldom-0.2.vapi
-# vapidir = $(VALA_VAPIDIR)
-# vapi_DATA = gxmldom-0.2.vapi
-#
-# CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA) gxml-0.2.vapi gxml-dom.h
-#
-# EXTRA_DIST = \
-# libgxmldom-0.2.pc \
-# $(libgxmldom_la_VALASOURCES:.vala=.c) \
-# $(vapi_DATA) \
-# $(typelibs_DATA) \
-# $(INTROSPECTION_GIRS) \
-# gxml.vala.stamp
-#
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]