Update liblwgeom version to use Version.config

git-svn-id: http://svn.osgeo.org/postgis/trunk@14230 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 822665c6259d30d245a6c7bb885b2d3e567d0266..46d4a228943c17458f8beed415e985e93e6ba1f0 100644 (file)
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -1,15 +1,19 @@
 How to release
 ~~~~~~~~~~~~~~
-Date: 2014-05-14
+Date: 2015-10-08
 
 Versioning Scheme
 -----------------
 
-Release version is composed by POSTGIS_MAJOR_VERSION, POSTGIS_MINOR_VERSION
-and POSTGIS_MICRO_VERSION components.
+*PostGIS*
+
+PostGIS release version is composed by POSTGIS_MAJOR_VERSION,
+POSTGIS_MINOR_VERSION and POSTGIS_MICRO_VERSION components, all
+set in Version.config.
 
 By default only [POSTGIS_MICRO_VERSION] increments between releases.
-Starting at PostGIS 2.1 in development  POSTGIS_MICRO_VERSION should have a dev at the end
+Starting at PostGIS 2.1 in development  POSTGIS_MICRO_VERSION should have
+a "dev" string at the end
 
 [POSTGIS_MINOR_VERSION] is incremented (and MICRO set to 0) when minor
 additions have been introduced (one or two functions can be considered
@@ -23,6 +27,15 @@ All POSTGIS_MICRO_VERSION that are in branch or trunk should end in dev.
 So for example if you just release 2.1.1, then the 2.1 branch should have
 POSTGIS_MICRO_VERSION set to 2dev so that the full version is 2.1.2dev.
 
+*Liblwgeom*
+
+Liblwgeom versioning is composed by by LIBLWGEOM_IFACE_CUR,
+LIBLWGEOM_IFACE_AGE and LIBLWGEOM_IFACE_REV; all set and documented
+in Version.config.
+
+The liblwgeom versioning represents compatibility of the library
+within a PostGIS minor version.
+
 Requirements
 ------------
 

diff --git a/Version.config b/Version.config
index cdbb1c8fd5fa65888ebee0f34305e0438c7e1f9a..e0679c4964c990a946a1254ac2c84030a7d4b768 100644 (file)
--- a/Version.config
+++ b/Version.config
@@ -7,3 +7,16 @@ POSTGIS_MAJOR_VERSION=2
 POSTGIS_MINOR_VERSION=3
 POSTGIS_MICRO_VERSION=0dev
 
+# Liblwgeom interface versioning, reset to 1:0:0 (cur:age:rev)
+# when changing POSTGIS_MINOR_VERSION
+
+# Current interface, increments when adding an interface
+LIBLWGEOM_IFACE_CUR=1
+# Age of current interface, only changes when current interface
+# changes, either incrementing with it (compatible change) or
+# going back to zero (incompatible change).
+LIBLWGEOM_IFACE_AGE=0
+# Revision of current interface, set to 0 when adding an interface
+# or increment when just changing implementations.
+LIBLWGEOM_IFACE_REV=0
+

diff --git a/configure.ac b/configure.ac
index 15a5cd1758d9ac4a0156fd22cfdff5b3505115e8..2228b7e69e1e9e5d611ecbea723e7f0eba468991 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,11 +98,11 @@ AC_SUBST([POSTGIS_MINOR_VERSION])
 AC_SUBST([POSTGIS_MICRO_VERSION])
 
 dnl
-dnl Convert PostGIS version info into liblwgeom libtool-happy numbers
+dnl Liblwgeom version information imported from Version.config
 dnl
-LIBLWGEOM_CURRENT=`expr $POSTGIS_MAJOR_VERSION + $POSTGIS_MINOR_VERSION`
-LIBLWGEOM_AGE=$POSTGIS_MINOR_VERSION
-LIBLWGEOM_REV=`echo $POSTGIS_MICRO_VERSION | perl -p -e 's/(\d+)\w*\d*/$1/g'`
+LIBLWGEOM_CURRENT=`cat Version.config | grep LIBLWGEOM_IFACE_CUR | sed 's/[[^=]]*=\([[0-9]]\)/\1/g'`
+LIBLWGEOM_AGE=`cat Version.config | grep LIBLWGEOM_IFACE_AGE | sed 's/[[^=]]*=\([[0-9]]\)/\1/g'`
+LIBLWGEOM_REV=`cat Version.config | grep LIBLWGEOM_IFACE_REV | sed 's/[[^=]]*=\([[0-9]]\)/\1/g'`
 AC_SUBST([LIBLWGEOM_CURRENT])
 AC_SUBST([LIBLWGEOM_AGE])
 AC_SUBST([LIBLWGEOM_REV])