[geos-commits] [SCM] GEOS branch master updated. d7a7b599ec1754e20a23c524a49a1a72bf8b2605
git at osgeo.org
git at osgeo.org
Sun Aug 19 04:26:45 PDT 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, master has been updated
via d7a7b599ec1754e20a23c524a49a1a72bf8b2605 (commit)
from 49f662177cde74c83b3e2fd2cdfe13a2897e2731 (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 d7a7b599ec1754e20a23c524a49a1a72bf8b2605
Author: Regina Obe <lr at pcorp.us>
Date: Sun Aug 19 07:26:38 2018 -0400
Flip master to 3.8 development
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 794d635..1a3cf97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
#################################################################################
# Set GEOS project
#################################################################################
-project(GEOS VERSION 3.7.0 LANGUAGES C CXX)
+project(GEOS VERSION 3.8.0 LANGUAGES C CXX)
# Add custom GEOS modules for CMake
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index db48e15..8ca376b 100644
--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -59,9 +59,9 @@ extern "C" {
#if defined(_MSC_VER)
#include <geos/version.h>
#define GEOS_CAPI_VERSION_MAJOR 1
-#define GEOS_CAPI_VERSION_MINOR 11
+#define GEOS_CAPI_VERSION_MINOR 12
#define GEOS_CAPI_VERSION_PATCH 0
-#define GEOS_CAPI_VERSION "3.7.0-CAPI-1.11.0"
+#define GEOS_CAPI_VERSION "3.8.0-CAPI-1.12.0"
#else
#ifndef GEOS_VERSION_MAJOR
#define GEOS_VERSION_MAJOR @VERSION_MAJOR@
diff --git a/configure.ac b/configure.ac
index 2ffad35..8b4400a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,17 +14,17 @@ dnl -- JTS_PORT: the version of JTS this release is bound to
JTS_PORT=1.13.0
dnl -- Version info for the CAPI
-CAPI_INTERFACE_CURRENT=12
+CAPI_INTERFACE_CURRENT=13
CAPI_INTERFACE_REVISION=0
-CAPI_INTERFACE_AGE=11
+CAPI_INTERFACE_AGE=12
dnl
dnl -- Release versions / C++ library SONAME will use these
dnl -- encoding ABI break at every release
dnl
VERSION_MAJOR=3
-VERSION_MINOR=7
-VERSION_PATCH=0rc1
+VERSION_MINOR=8
+VERSION_PATCH=0dev
VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
VERSION_RELEASE=`echo "$VERSION" | sed -E 's/^([[0-9]+\.[0-9]+\.[0-9]+]).*?$/\1/'`
diff --git a/include/geos/version.h.vc b/include/geos/version.h.vc
index 6a8cc1f..368fcfe 100644
--- a/include/geos/version.h.vc
+++ b/include/geos/version.h.vc
@@ -30,15 +30,15 @@
#endif
#ifndef GEOS_VERSION_MINOR
-#define GEOS_VERSION_MINOR 7
+#define GEOS_VERSION_MINOR 8
#endif
#ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 0
+#define GEOS_VERSION_PATCH 0dev
#endif
#ifndef GEOS_VERSION
-#define GEOS_VERSION "3.7.0"
+#define GEOS_VERSION "3.8.0dev"
#endif
#ifndef GEOS_JTS_PORT
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 2 +-
capi/geos_c.h.in | 4 ++--
configure.ac | 8 ++++----
include/geos/version.h.vc | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list