aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2020-01-01 22:02:54 +0100
committerKristian Evers <kristianevers@gmail.com>2020-01-01 22:02:54 +0100
commitfd377df0d12d4127ed277f4f3c11a4122eab3ccf (patch)
treeb0cc9e13fa910a2580b2f524930207987c189064
parenta1e8314d97cacca325161efbe8d2ac9bdfdc36ad (diff)
downloadPROJ-fd377df0d12d4127ed277f4f3c11a4122eab3ccf.tar.gz
PROJ-fd377df0d12d4127ed277f4f3c11a4122eab3ccf.zip
Bump version numbers in preparation for 7.0.0 release
-rw-r--r--CMakeLists.txt2
-rw-r--r--configure.ac2
-rw-r--r--docs/source/conf.py2
-rw-r--r--src/proj.h4
-rw-r--r--src/proj_api.h2
-rw-r--r--src/release.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53a88de4..9d108135 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,7 +103,7 @@ colormsg(_HIBLUE_ "Configuring PROJ:")
#PROJ version information
################################################################################
include(ProjVersion)
-proj_version(MAJOR 6 MINOR 3 PATCH 0)
+proj_version(MAJOR 7 MINOR 0 PATCH 0)
set(PROJ_API_VERSION "18")
set(PROJ_BUILD_VERSION "18.0.3")
diff --git a/configure.ac b/configure.ac
index 0ea8e04a..e9274621 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([PROJ], [6.3.0],
+AC_INIT([PROJ], [7.0.0],
[https://github.com/OSGeo/PROJ/issues], proj, [https://proj.org])
AC_CONFIG_MACRO_DIR([m4])
AC_LANG(C)
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 8655c7ad..95458917 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -68,7 +68,7 @@ copyright = u'1983-{0}'.format(now.year)
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
-version = '6.3.0'
+version = '7.0.0'
# use same |release| as |version|
release = version
diff --git a/src/proj.h b/src/proj.h
index f31c778b..410f1e71 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -152,8 +152,8 @@ extern "C" {
#endif
/* The version numbers should be updated with every release! **/
-#define PROJ_VERSION_MAJOR 6
-#define PROJ_VERSION_MINOR 3
+#define PROJ_VERSION_MAJOR 7
+#define PROJ_VERSION_MINOR 0
#define PROJ_VERSION_PATCH 0
extern char const PROJ_DLL pj_release[]; /* global release id string */
diff --git a/src/proj_api.h b/src/proj_api.h
index 852cb14c..24046026 100644
--- a/src/proj_api.h
+++ b/src/proj_api.h
@@ -38,7 +38,7 @@
#endif
#ifndef PJ_VERSION
-#define PJ_VERSION 630
+#define PJ_VERSION 700
#endif
#ifdef PROJ_RENAME_SYMBOLS
diff --git a/src/release.cpp b/src/release.cpp
index 425bdb9a..648c5398 100644
--- a/src/release.cpp
+++ b/src/release.cpp
@@ -11,7 +11,7 @@ char const pj_release[] =
STR(PROJ_VERSION_MAJOR)"."
STR(PROJ_VERSION_MINOR)"."
STR(PROJ_VERSION_PATCH)", "
- "January 1st, 2020";
+ "March 1st, 2020";
const char *pj_get_release() {
return pj_release;