diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-01-08 19:36:00 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-01-08 19:36:00 +0000 |
commit | d6047692a5d54d7a40d38db7fd98fca2eb59de91 (patch) | |
tree | 44718e7a33dfa85fcdfe7dbdc3a31814f5e27133 | |
parent | c09c3b6078879b2fef28e1c8cdbc9e0966ed2510 (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.txt | 4 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rwxr-xr-x | other/version-sync | 2 | ||||
-rw-r--r-- | so.version | 4 | ||||
-rw-r--r-- | toxcore/tox.api.h | 4 | ||||
-rw-r--r-- | toxcore/tox.h | 4 |
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. |
31 | set(PROJECT_VERSION_MAJOR "0") | 31 | set(PROJECT_VERSION_MAJOR "0") |
32 | set(PROJECT_VERSION_MINOR "1") | 32 | set(PROJECT_VERSION_MINOR "2") |
33 | set(PROJECT_VERSION_PATCH "11") | 33 | set(PROJECT_VERSION_PATCH "0") |
34 | set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") | 34 | set(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 | ||
4 | AC_PREREQ([2.65]) | 4 | AC_PREREQ([2.65]) |
5 | AC_INIT([tox], [0.1.11]) | 5 | AC_INIT([tox], [0.2.0]) |
6 | AC_CONFIG_AUX_DIR(configure_aux) | 6 | AC_CONFIG_AUX_DIR(configure_aux) |
7 | AC_CONFIG_SRCDIR([toxcore/net_crypto.c]) | 7 | AC_CONFIG_SRCDIR([toxcore/net_crypto.c]) |
8 | AC_CONFIG_HEADERS([config.h]) | 8 | AC_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 |
65 | LAST_SOMAJOR=1 | 65 | LAST_SOMAJOR=2 |
66 | 66 | ||
67 | if [ $MAJOR -eq 0 ]; then | 67 | if [ $MAJOR -eq 0 ]; then |
68 | SOMAJOR=$MINOR | 68 | SOMAJOR=$MINOR |
@@ -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 | ||
14 | CURRENT=12 | 14 | CURRENT=2 |
15 | REVISION=0 | 15 | REVISION=0 |
16 | AGE=11 | 16 | AGE=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 | */ |
176 | const VERSION_MINOR = 1; | 176 | const 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 | */ |
182 | const VERSION_PATCH = 11; | 182 | const 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 | ||
177 | uint32_t tox_version_minor(void); | 177 | uint32_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 | ||
185 | uint32_t tox_version_patch(void); | 185 | uint32_t tox_version_patch(void); |
186 | 186 | ||