[geos-commits] r4272 - in trunk: . capi include/geos
Sandro Santilli
strk at kbt.io
Tue Oct 25 08:55:03 PDT 2016
Author: strk
Date: 2016-10-25 08:55:02 -0700 (Tue, 25 Oct 2016)
New Revision: 4272
Modified:
trunk/CMakeLists.txt
trunk/HOWTO_RELEASE
trunk/capi/geos_c.h.in
trunk/configure.ac
trunk/include/geos/version.h.vc
Log:
Increment version to 3.7.0dev
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2016-10-25 15:54:26 UTC (rev 4271)
+++ trunk/CMakeLists.txt 2016-10-25 15:55:02 UTC (rev 4272)
@@ -28,8 +28,8 @@
# GEOS release version
# GEOS C++ library SONAME will use these encoding ABI break at every release
set(VERSION_MAJOR 3)
-set(VERSION_MINOR 6)
-set(VERSION_PATCH 0)
+set(VERSION_MINOR 7)
+set(VERSION_PATCH 0dev)
set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
# JTS_PORT is the version of JTS this release is bound to
@@ -37,9 +37,9 @@
message(STATUS "Setting GEOS version ${VERSION} as port of JTS ${JTS_PORT}")
# GEOS C API version
-set(CAPI_INTERFACE_CURRENT 11)
+set(CAPI_INTERFACE_CURRENT 12)
set(CAPI_INTERFACE_REVISION 0)
-set(CAPI_INTERFACE_AGE 10)
+set(CAPI_INTERFACE_AGE 11)
math(EXPR CAPI_VERSION_MAJOR "${CAPI_INTERFACE_CURRENT} - ${CAPI_INTERFACE_AGE}")
set(CAPI_VERSION_MINOR ${CAPI_INTERFACE_AGE})
Modified: trunk/HOWTO_RELEASE
===================================================================
--- trunk/HOWTO_RELEASE 2016-10-25 15:54:26 UTC (rev 4271)
+++ trunk/HOWTO_RELEASE 2016-10-25 15:55:02 UTC (rev 4272)
@@ -14,7 +14,7 @@
$ svn copy -m "Tagged release MAJOR.MINOR.PATCH" \
$base/trunk $base/tags/MAJOR.MINOR.PATCH
-7: Export the tag and 'make dist-bzip2'.
+7: Export the tag and 'make dist-bzip2'.
$ svn export $base/tags/$rev
$ cd $rev
$ ./autogen.sh && ./configure && make dist-bzip2
@@ -25,7 +25,7 @@
10: Increment all the version numbers for the next release, as below.
-11: Increment CAPI_INTERFACE_X in configure.in
+11: Increment CAPI_INTERFACE_X in configure.ac
- For a release with no interface changes just bump REVISION.
[ Even if *nothing* changed in CAPI ]
- Adding interfaces, bump CURRENT/AGE, set REVISION to 0.
@@ -34,7 +34,7 @@
12: Increment release version:
- In configure.ac
- - In include/geos/version.h.vc
+ - In include/geos/version.h.vc
- In capi/geos_c.h.in
- VERSION_PATCH for bugfixes/improvements (even breaking C++ API)
- VERSION_MINOR for NEW interfaces in the C lib
@@ -48,5 +48,5 @@
- Add latest release
- Remove previos patch level release (if any)
-14: Announce
-
+14: Announce
+
Modified: trunk/capi/geos_c.h.in
===================================================================
--- trunk/capi/geos_c.h.in 2016-10-25 15:54:26 UTC (rev 4271)
+++ trunk/capi/geos_c.h.in 2016-10-25 15:55:02 UTC (rev 4272)
@@ -25,7 +25,7 @@
* all returned char * (unless const).
*
* - Functions ending with _r are thread safe; see details in RFC 3
- * http://trac.osgeo.org/geos/wiki/RFC3.
+ * http://trac.osgeo.org/geos/wiki/RFC3.
* To avoid using by accident non _r functions,
* define GEOS_USE_ONLY_R_API before including geos_c.h
*
@@ -59,9 +59,9 @@
#if defined(_MSC_VER)
#include <geos/version.h>
#define GEOS_CAPI_VERSION_MAJOR 1
-#define GEOS_CAPI_VERSION_MINOR 10
+#define GEOS_CAPI_VERSION_MINOR 11
#define GEOS_CAPI_VERSION_PATCH 0
-#define GEOS_CAPI_VERSION "3.6.0-CAPI-1.10.0"
+#define GEOS_CAPI_VERSION "3.7.0-CAPI-1.11.0"
#else
#ifndef GEOS_VERSION_MAJOR
#define GEOS_VERSION_MAJOR @VERSION_MAJOR@
@@ -693,7 +693,7 @@
/*
* Returns the Voronoi polygons of a set of Vertices given as input
- *
+ *
* @param g the input geometry whose vertex will be used as sites.
* @param tolerance snapping tolerance to use for improved robustness
* @param onlyEdges whether to return only edges of the voronoi cells
@@ -701,12 +701,12 @@
* determined if NULL.
* The diagram will be clipped to the larger
* of this envelope or an envelope surrounding the sites.
- *
+ *
* @return a newly allocated geometry, or NULL on exception.
*/
extern GEOSGeometry GEOS_DLL * GEOSVoronoiDiagram_r(
- GEOSContextHandle_t extHandle,
- const GEOSGeometry *g,
+ GEOSContextHandle_t extHandle,
+ const GEOSGeometry *g,
const GEOSGeometry *env,
double tolerance,
int onlyEdges);
@@ -1635,7 +1635,7 @@
/*
* Returns the Voronoi polygons of a set of Vertices given as input
- *
+ *
* @param g the input geometry whose vertex will be used as sites.
* @param tolerance snapping tolerance to use for improved robustness
* @param onlyEdges whether to return only edges of the voronoi cells
@@ -1643,7 +1643,7 @@
* determined if NULL.
* The diagram will be clipped to the larger
* of this envelope or an envelope surrounding the sites.
- *
+ *
* @return a newly allocated geometry, or NULL on exception.
*/
extern GEOSGeometry GEOS_DLL * GEOSVoronoiDiagram(
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2016-10-25 15:54:26 UTC (rev 4271)
+++ trunk/configure.ac 2016-10-25 15:55:02 UTC (rev 4272)
@@ -14,17 +14,17 @@
JTS_PORT=1.13.0
dnl -- Version info for the CAPI
-CAPI_INTERFACE_CURRENT=11
+CAPI_INTERFACE_CURRENT=12
CAPI_INTERFACE_REVISION=0
-CAPI_INTERFACE_AGE=10
+CAPI_INTERFACE_AGE=11
dnl
dnl -- Release versions / C++ library SONAME will use these
dnl -- encoding ABI break at every release
dnl
VERSION_MAJOR=3
-VERSION_MINOR=6
-VERSION_PATCH=0
+VERSION_MINOR=7
+VERSION_PATCH=0dev
VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
Modified: trunk/include/geos/version.h.vc
===================================================================
--- trunk/include/geos/version.h.vc 2016-10-25 15:54:26 UTC (rev 4271)
+++ trunk/include/geos/version.h.vc 2016-10-25 15:55:02 UTC (rev 4272)
@@ -7,7 +7,7 @@
*
* This is free software; you can redistribute and/or modify it under
* the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation.
* See the COPYING file for more information.
*
**********************************************************************
@@ -30,7 +30,7 @@
#endif
#ifndef GEOS_VERSION_MINOR
-#define GEOS_VERSION_MINOR 6
+#define GEOS_VERSION_MINOR 7
#endif
#ifndef GEOS_VERSION_PATCH
@@ -38,7 +38,7 @@
#endif
#ifndef GEOS_VERSION
-#define GEOS_VERSION "3.6.0"
+#define GEOS_VERSION "3.7.0"
#endif
#ifndef GEOS_JTS_PORT
More information about the geos-commits
mailing list