From 9967ec1f441605d2de3838a31f9993750dcbff90 Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 7 Jan 2016 13:28:40 +0300 Subject: [PATCH] Changed version to 2.2.0 --- CMakeLists.txt | 2 +- build/Makefile | 2 +- cds/version.h | 4 ++-- doxygen/cds.doxy | 2 +- projects/android/jni/Android.mk | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 89957832..b445413b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_policy(SET CMP0016 NEW) project(cds) -set(PROJECT_VERSION 2.1.0) +set(PROJECT_VERSION 2.2.0) # Options option(WITH_TESTS "Build unit tests" OFF) diff --git a/build/Makefile b/build/Makefile index bb54ad54..0cf129b6 100644 --- a/build/Makefile +++ b/build/Makefile @@ -5,7 +5,7 @@ .SUFFIXES:.cpp .c .ro # make_distrib.pl substitutes the correct version -VERSION=2.1.0 +VERSION=2.2.0 # boost_thread lib used by test application. # You may change the library name diff --git a/cds/version.h b/cds/version.h index 337ba6ba..222f0e61 100644 --- a/cds/version.h +++ b/cds/version.h @@ -33,14 +33,14 @@ // cds library version -#define CDS_VERSION 0x020100 +#define CDS_VERSION 0x020200 #define CDS_VERSION_MAJOR ((CDS_VERSION & 0xFF0000)>> 16) #define CDS_VERSION_MINOR ((CDS_VERSION & 0x00FF00) >> 8) #define CDS_VERSION_PATCH (CDS_VERSION & 0x0000FF) // CDS_VERSION == CDS_VERSION_MAJOR '.' CDS_VERSION_MINOR '.' CDS_VERSION_PATCH -#define CDS_VERSION_STRING "2.1.0" +#define CDS_VERSION_STRING "2.2.0" #endif // #ifndef CDSLIB_VERSION_H diff --git a/doxygen/cds.doxy b/doxygen/cds.doxy index fd6a72d8..297ca0dc 100644 --- a/doxygen/cds.doxy +++ b/doxygen/cds.doxy @@ -31,7 +31,7 @@ PROJECT_NAME = cds # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.1.0 +PROJECT_NUMBER = 2.2.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/projects/android/jni/Android.mk b/projects/android/jni/Android.mk index 99f2eff9..4505c042 100644 --- a/projects/android/jni/Android.mk +++ b/projects/android/jni/Android.mk @@ -1,5 +1,5 @@ - CDS_LIBRARY_VERSION := 2.1.0 + CDS_LIBRARY_VERSION := 2.2.0 LOCAL_PATH := $(call my-dir) CDS_ROOT_DIR = $(LOCAL_PATH)/../../.. -- 2.34.1