[geos-commits] [SCM] GEOS branch vernums updated. 9516a2f509d71165f6b4a8aa07a14e0424938ca0
git at osgeo.org
git at osgeo.org
Thu Dec 20 16:59:06 PST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, vernums has been updated
via 9516a2f509d71165f6b4a8aa07a14e0424938ca0 (commit)
via 4956cd6cd672ed62eb2ee7198306caa0467a9ba1 (commit)
via 3c441209e129b174ffaeb2be4696db2af02c8167 (commit)
via 603e07495dfdd6f227b71f2664955d2298a1ce1e (commit)
via ff61cef210ca3d1e5892a868004dad914e4ac66b (commit)
via 72567b2b8c62d2384c1fd973b81b6b9572a2c2b5 (commit)
from 4770296031f0296f728164044d66da32f677b270 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9516a2f509d71165f6b4a8aa07a14e0424938ca0
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Dec 20 15:10:07 2018 -0800
Prefix version file with srcdir for out-of-tree support
diff --git a/configure.ac b/configure.ac
index 0700bf5..6ded2e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,26 +10,26 @@ AC_CANONICAL_SYSTEM
AC_CONFIG_MACRO_DIR([macros])
-dnl -- JTS_PORT: the version of JTS this release is bound to
-dnl JTS_PORT=1.13.0
-JTS_PORT=`cat Version.txt | grep ^JTS_PORT | sed 's/[[^=]]*=\([[0-9a-zA-Z\.]]\)/\1/g'`
-
dnl
dnl -- Release versions / C++ library SONAME will use these
dnl -- encoding ABI break at every release
dnl
-VERSION_MAJOR=`cat Version.txt | awk -F= '/^GEOS_VERSION_MAJOR/ {print $2}'`
-VERSION_MINOR=`cat Version.txt | awk -F= '/^GEOS_VERSION_MINOR/ {print $2}'`
-VERSION_PATCH=`cat Version.txt | awk -F= '/^GEOS_VERSION_PATCH/ {print $2}'`
-PATCH_WORD=`cat Version.txt | awk -F= '/^GEOS_PATCH_WORD/ {print $2}'`
+VERTXT=${srcdir}/Version.txt
+VERSION_MAJOR=`cat $VERTXT | awk -F= '/^GEOS_VERSION_MAJOR/ {print $2}'`
+VERSION_MINOR=`cat $VERTXT | awk -F= '/^GEOS_VERSION_MINOR/ {print $2}'`
+VERSION_PATCH=`cat $VERTXT | awk -F= '/^GEOS_VERSION_PATCH/ {print $2}'`
+PATCH_WORD=`cat $VERTXT | awk -F= '/^GEOS_PATCH_WORD/ {print $2}'`
VERSION_PATCH=${VERSION_PATCH}${PATCH_WORD}
VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*$/\1/'`
-CAPI_INTERFACE_CURRENT=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_CURRENT/ {print $2}'`
-CAPI_INTERFACE_REVISION=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_REVISION/ {print $2}'`
-CAPI_INTERFACE_AGE=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_AGE/ {print $2}'`
+AC_MSG_CHECKING([for GEOS version])
+AC_MSG_RESULT(["$VERSION"])
+
+CAPI_INTERFACE_CURRENT=`cat $VERTXT | awk -F= '/^CAPI_INTERFACE_CURRENT/ {print $2}'`
+CAPI_INTERFACE_REVISION=`cat $VERTXT | awk -F= '/^CAPI_INTERFACE_REVISION/ {print $2}'`
+CAPI_INTERFACE_AGE=`cat $VERTXT | awk -F= '/^CAPI_INTERFACE_AGE/ {print $2}'`
dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
dnl the following should be more portable
@@ -38,11 +38,18 @@ CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE
CAPI_VERSION_PATCH=$CAPI_INTERFACE_REVISION
CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH"
+AC_MSG_CHECKING([for GEOS CAPI version])
+AC_MSG_RESULT(["$CAPI_VERSION"])
+
AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define])
AM_MAINTAINER_MODE
AC_CONFIG_HEADERS([include/config.h] [include/geos/platform.h])
AC_PROG_CC
+dnl -- JTS_PORT: the version of JTS this release is bound to
+dnl JTS_PORT=1.13.0
+JTS_PORT=`cat $VERTXT | awk -F= '/^JTS_PORT/ {print $2}'`
+
dnl Hush warnings
AC_DEFINE(USE_UNSTABLE_GEOS_CPP_API, [1], [We know])
commit 4956cd6cd672ed62eb2ee7198306caa0467a9ba1
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Dec 20 14:59:03 2018 -0800
Harmonize spacing with other entries
diff --git a/Makefile.am b/Makefile.am
index 4b3df89..d4e45d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,25 +12,25 @@
# (we'll still take care of adding it ourselves)
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = \
- include \
- src \
- capi \
- doc \
- macros \
- swig \
- tests \
- tools
+SUBDIRS = \
+ include \
+ src \
+ capi \
+ doc \
+ macros \
+ swig \
+ tests \
+ tools
BUILT_SOURCES = geos_revision.h
EXTRA_DIST = acsite.m4 .editorconfig makefile.vc \
Version.txt nmake.opt autogen.bat CMakeLists.txt \
- cmake/modules/CheckPrototypeExists.cmake \
- cmake/modules/COPYING-CMAKE-SCRIPTS \
- cmake/modules/GenerateSourceGroups.cmake \
- cmake/cmake_uninstall.cmake.in geos_revision.h \
- README.md
+ cmake/modules/CheckPrototypeExists.cmake \
+ cmake/modules/COPYING-CMAKE-SCRIPTS \
+ cmake/modules/GenerateSourceGroups.cmake \
+ cmake/cmake_uninstall.cmake.in geos_revision.h \
+ README.md
ACLOCAL_AMFLAGS = -I macros
commit 3c441209e129b174ffaeb2be4696db2af02c8167
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Dec 20 14:47:45 2018 -0800
Aha, add Version.txt to dist files
diff --git a/Makefile.am b/Makefile.am
index 937914e..4b3df89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,8 @@ SUBDIRS = \
BUILT_SOURCES = geos_revision.h
-EXTRA_DIST = acsite.m4 .editorconfig makefile.vc nmake.opt autogen.bat CMakeLists.txt \
+EXTRA_DIST = acsite.m4 .editorconfig makefile.vc \
+ Version.txt nmake.opt autogen.bat CMakeLists.txt \
cmake/modules/CheckPrototypeExists.cmake \
cmake/modules/COPYING-CMAKE-SCRIPTS \
cmake/modules/GenerateSourceGroups.cmake \
diff --git a/configure.ac b/configure.ac
index e3e7eeb..0700bf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,9 +377,6 @@ AC_SUBST(VERSION_MAJOR)
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_PATCH)
AC_SUBST(VERSION_RELEASE)
-AC_SUBST(INTERFACE_CURRENT)
-AC_SUBST(INTERFACE_REVISION)
-AC_SUBST(INTERFACE_AGE)
AC_SUBST(JTS_PORT)
AC_SUBST(CAPI_VERSION)
AC_SUBST(CAPI_VERSION_MAJOR)
commit 603e07495dfdd6f227b71f2664955d2298a1ce1e
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Dec 20 14:22:37 2018 -0800
Still trying to get past CI
diff --git a/configure.ac b/configure.ac
index be22720..e3e7eeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,19 +27,16 @@ VERSION_PATCH=${VERSION_PATCH}${PATCH_WORD}
VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*$/\1/'`
-INTERFACE_CURRENT=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_CURRENT/ {print $2}'`
-INTERFACE_REVISION=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_REVISION/ {print $2}'`
-INTERFACE_AGE=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_AGE/ {print $2}'`
+CAPI_INTERFACE_CURRENT=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_CURRENT/ {print $2}'`
+CAPI_INTERFACE_REVISION=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_REVISION/ {print $2}'`
+CAPI_INTERFACE_AGE=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_AGE/ {print $2}'`
-dnl CAPI_VERSION_MAJOR=$(($INTERFACE_CURRENT-$INTERFACE_AGE))
+dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
dnl the following should be more portable
-CAPI_VERSION_MAJOR=`expr $INTERFACE_CURRENT - $INTERFACE_AGE`
-CAPI_VERSION_MINOR=$INTERFACE_AGE
-CAPI_VERSION_PATCH=$INTERFACE_REVISION
+CAPI_VERSION_MAJOR=`expr $CAPI_INTERFACE_CURRENT - $CAPI_INTERFACE_AGE`
+CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE
+CAPI_VERSION_PATCH=$CAPI_INTERFACE_REVISION
CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH"
-CAPI_INTERFACE_CURRENT=$INTERFACE_CURRENT
-CAPI_INTERFACE_REVISION=$INTERFACE_REVISION
-CAPI_INTERFACE_AGE=$INTERFACE_AGE
AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define])
AM_MAINTAINER_MODE
commit ff61cef210ca3d1e5892a868004dad914e4ac66b
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Dec 20 13:40:59 2018 -0800
Really get those CAPI numbers in...
diff --git a/configure.ac b/configure.ac
index 778417f..be22720 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,8 @@ CAPI_VERSION_MINOR=$INTERFACE_AGE
CAPI_VERSION_PATCH=$INTERFACE_REVISION
CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH"
CAPI_INTERFACE_CURRENT=$INTERFACE_CURRENT
-CAPI_INTERFACE_REVISION=INTERFACE_REVISION
-CAPI_INTERFACE_AGE=INTERFACE_AGE
+CAPI_INTERFACE_REVISION=$INTERFACE_REVISION
+CAPI_INTERFACE_AGE=$INTERFACE_AGE
AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define])
AM_MAINTAINER_MODE
commit 72567b2b8c62d2384c1fd973b81b6b9572a2c2b5
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Dec 20 13:08:26 2018 -0800
Fill out other common macros for autotools
diff --git a/configure.ac b/configure.ac
index d5fd337..778417f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,11 +14,6 @@ dnl -- JTS_PORT: the version of JTS this release is bound to
dnl JTS_PORT=1.13.0
JTS_PORT=`cat Version.txt | grep ^JTS_PORT | sed 's/[[^=]]*=\([[0-9a-zA-Z\.]]\)/\1/g'`
-dnl -- Version info for the CAPI
-dnl CAPI_INTERFACE_CURRENT=13
-dnl CAPI_INTERFACE_REVISION=0
-dnl CAPI_INTERFACE_AGE=12
-
dnl
dnl -- Release versions / C++ library SONAME will use these
dnl -- encoding ABI break at every release
@@ -32,16 +27,19 @@ VERSION_PATCH=${VERSION_PATCH}${PATCH_WORD}
VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*$/\1/'`
-CAPI_INTERFACE_CURRENT=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_CURRENT/ {print $2}'`
-CAPI_INTERFACE_REVISION=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_REVISION/ {print $2}'`
-CAPI_INTERFACE_AGE=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_AGE/ {print $2}'`
+INTERFACE_CURRENT=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_CURRENT/ {print $2}'`
+INTERFACE_REVISION=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_REVISION/ {print $2}'`
+INTERFACE_AGE=`cat Version.txt | awk -F= '/^CAPI_INTERFACE_AGE/ {print $2}'`
-dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
+dnl CAPI_VERSION_MAJOR=$(($INTERFACE_CURRENT-$INTERFACE_AGE))
dnl the following should be more portable
-CAPI_VERSION_MAJOR=`expr $CAPI_INTERFACE_CURRENT - $CAPI_INTERFACE_AGE`
-CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE
-CAPI_VERSION_PATCH=$CAPI_INTERFACE_REVISION
+CAPI_VERSION_MAJOR=`expr $INTERFACE_CURRENT - $INTERFACE_AGE`
+CAPI_VERSION_MINOR=$INTERFACE_AGE
+CAPI_VERSION_PATCH=$INTERFACE_REVISION
CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH"
+CAPI_INTERFACE_CURRENT=$INTERFACE_CURRENT
+CAPI_INTERFACE_REVISION=INTERFACE_REVISION
+CAPI_INTERFACE_AGE=INTERFACE_AGE
AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define])
AM_MAINTAINER_MODE
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 31 ++++++++++++++++---------------
configure.ac | 37 ++++++++++++++++++-------------------
2 files changed, 34 insertions(+), 34 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list