From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 13 Mar 2017 12:53:59 +0000 (+0100)
Subject: Introduce $API_VERSION as base for $PACKAGE_SUFFIX and for usage in manual
X-Git-Tag: 0.36.0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54ceaec3c86aa4fb1735ed18e7b2ed27112ba335;p=thirdparty%2Fvala.git

Introduce $API_VERSION as base for $PACKAGE_SUFFIX and for usage in manual

This goes along with unbreaking the manual-build with libxslt < 1.1.27.

https://bugzilla.gnome.org/show_bug.cgi?id=779968
---

diff --git a/configure.ac b/configure.ac
index 14a771baa..e68e9be44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,12 +10,14 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip])
 AM_MAINTAINER_MODE([enable])
 
-PACKAGE_SUFFIX=-0.36
+API_VERSION=0.36
+PACKAGE_SUFFIX="-$API_VERSION"
 
 dnl http://people.gnome.org/~walters/docs/build-api.txt
 dnl We don't support separate builddir when building from git
 echo \#buildapi-variable-no-builddir >/dev/null
 
+AC_SUBST(API_VERSION)
 AC_SUBST(PACKAGE_SUFFIX)
 AC_DEFINE_UNQUOTED(PACKAGE_SUFFIX, "$PACKAGE_SUFFIX", [Define to the suffix of this package])
 
diff --git a/doc/manual/common.xsl b/doc/manual/common.xsl
index 713e6dadc..2a802b52d 100644
--- a/doc/manual/common.xsl
+++ b/doc/manual/common.xsl
@@ -109,7 +109,7 @@
   <xsl:template match="articleinfo" mode="toc">
     <xsl:apply-templates select="abstract"/>
     <table class="c-document_version">
-    <tr><td>Vala version:</td><td><xsl:apply-templates select="str:replace(edition, '-', '')"/></td></tr>
+    <tr><td>Vala version:</td><td><xsl:apply-templates select="edition"/></td></tr>
     <tr><td>Release:</td><td><xsl:apply-templates select="releaseinfo/text()"/></td></tr>
     <tr><td>Status:</td><td><xsl:apply-templates select="releaseinfo/remark"/></td></tr>
     <tr><td>Copyright:</td>
diff --git a/doc/manual/version.xml.in b/doc/manual/version.xml.in
index 3811e287c..3f7ead88a 100644
--- a/doc/manual/version.xml.in
+++ b/doc/manual/version.xml.in
@@ -6,7 +6,7 @@
 <para>The Vala Reference Manual gives details on Vala's syntax and type system, including polymorphism using interfaces and type parameters (generics). Vala includes additional code generation routines, for example D-Bus inter-process communication and GTK+3 composite templates, these are only referred to in the Attributes section. The reference manual does not provide a tutorial for these features.</para>
 <para>Vala is developed in a collaborative and self-supporting way by its users. They provide bug reports, documentation, patches, patch reviews and core development. Following this model of development the manual has an editable version at <ulink url="https://wiki.gnome.org/Projects/Vala/Manual">https://wiki.gnome.org/Projects/Vala/Manual</ulink> .</para>
 </abstract>
-<edition>@PACKAGE_SUFFIX@</edition>
+<edition>@API_VERSION@</edition>
 <releaseinfo>@VERSION@
 <remark>Draft, document contains omissions and might contain errors</remark>
 </releaseinfo>