summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-01-08 19:36:00 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-01-08 19:36:00 +0000
commitd6047692a5d54d7a40d38db7fd98fca2eb59de91 (patch)
tree44718e7a33dfa85fcdfe7dbdc3a31814f5e27133
parentc09c3b6078879b2fef28e1c8cdbc9e0966ed2510 (diff)
Bump toxcore version to 0.2.0.
We're not releasing yet, but projects preparing for the release will want to build against this version in master.
-rw-r--r--CMakeLists.txt4
-rw-r--r--configure.ac2
-rwxr-xr-xother/version-sync2
-rw-r--r--so.version4
-rw-r--r--toxcore/tox.api.h4
-rw-r--r--toxcore/tox.h4
6 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db202c45..cda3bb06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,8 @@ set(CMAKE_MODULE_PATH ${toxcore_SOURCE_DIR}/cmake)
29# This version is for the entire project. All libraries (core, av, ...) move in 29# This version is for the entire project. All libraries (core, av, ...) move in
30# versions in a synchronised way. 30# versions in a synchronised way.
31set(PROJECT_VERSION_MAJOR "0") 31set(PROJECT_VERSION_MAJOR "0")
32set(PROJECT_VERSION_MINOR "1") 32set(PROJECT_VERSION_MINOR "2")
33set(PROJECT_VERSION_PATCH "11") 33set(PROJECT_VERSION_PATCH "0")
34set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") 34set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
35 35
36# set .so library version / following libtool scheme 36# set .so library version / following libtool scheme
diff --git a/configure.ac b/configure.ac
index c4b7a25f..22b680a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
2# Process this file with autoconf to produce a configure script. 2# Process this file with autoconf to produce a configure script.
3 3
4AC_PREREQ([2.65]) 4AC_PREREQ([2.65])
5AC_INIT([tox], [0.1.11]) 5AC_INIT([tox], [0.2.0])
6AC_CONFIG_AUX_DIR(configure_aux) 6AC_CONFIG_AUX_DIR(configure_aux)
7AC_CONFIG_SRCDIR([toxcore/net_crypto.c]) 7AC_CONFIG_SRCDIR([toxcore/net_crypto.c])
8AC_CONFIG_HEADERS([config.h]) 8AC_CONFIG_HEADERS([config.h])
diff --git a/other/version-sync b/other/version-sync
index 0f60a038..9a98b055 100755
--- a/other/version-sync
+++ b/other/version-sync
@@ -62,7 +62,7 @@ update 'CMakeLists.txt' 's/\(PROJECT_VERSION_PATCH "\).*"/\1'$PATCH'"/'
62 62
63# the last major version number from the 0.x release cycle 63# the last major version number from the 0.x release cycle
64# this must be constant starting from the 1.0 release 64# this must be constant starting from the 1.0 release
65LAST_SOMAJOR=1 65LAST_SOMAJOR=2
66 66
67if [ $MAJOR -eq 0 ]; then 67if [ $MAJOR -eq 0 ]; then
68 SOMAJOR=$MINOR 68 SOMAJOR=$MINOR
diff --git a/so.version b/so.version
index 9594e0ff..fe67b718 100644
--- a/so.version
+++ b/so.version
@@ -11,6 +11,6 @@
11# For a full reference see: 11# For a full reference see:
12# https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info 12# https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
13 13
14CURRENT=12 14CURRENT=2
15REVISION=0 15REVISION=0
16AGE=11 16AGE=0
diff --git a/toxcore/tox.api.h b/toxcore/tox.api.h
index ce0b3a36..63959207 100644
--- a/toxcore/tox.api.h
+++ b/toxcore/tox.api.h
@@ -173,13 +173,13 @@ const VERSION_MAJOR = 0;
173 * breaking the API or ABI. Set to 0 when the major version number is 173 * breaking the API or ABI. Set to 0 when the major version number is
174 * incremented. 174 * incremented.
175 */ 175 */
176const VERSION_MINOR = 1; 176const VERSION_MINOR = 2;
177 177
178/** 178/**
179 * The patch or revision number. Incremented when bugfixes are applied without 179 * The patch or revision number. Incremented when bugfixes are applied without
180 * changing any functionality or API or ABI. 180 * changing any functionality or API or ABI.
181 */ 181 */
182const VERSION_PATCH = 11; 182const VERSION_PATCH = 0;
183 183
184/** 184/**
185 * A macro to check at preprocessing time whether the client code is compatible 185 * A macro to check at preprocessing time whether the client code is compatible
diff --git a/toxcore/tox.h b/toxcore/tox.h
index cb9c4fa0..567ce7e5 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -172,7 +172,7 @@ uint32_t tox_version_major(void);
172 * breaking the API or ABI. Set to 0 when the major version number is 172 * breaking the API or ABI. Set to 0 when the major version number is
173 * incremented. 173 * incremented.
174 */ 174 */
175#define TOX_VERSION_MINOR 1 175#define TOX_VERSION_MINOR 2
176 176
177uint32_t tox_version_minor(void); 177uint32_t tox_version_minor(void);
178 178
@@ -180,7 +180,7 @@ uint32_t tox_version_minor(void);
180 * The patch or revision number. Incremented when bugfixes are applied without 180 * The patch or revision number. Incremented when bugfixes are applied without
181 * changing any functionality or API or ABI. 181 * changing any functionality or API or ABI.
182 */ 182 */
183#define TOX_VERSION_PATCH 11 183#define TOX_VERSION_PATCH 0
184 184
185uint32_t tox_version_patch(void); 185uint32_t tox_version_patch(void);
186 186