From 112656dc1f73641768d1c5af6ba332552940f9b6 Mon Sep 17 00:00:00 2001 From: khizmax Date: Tue, 30 Dec 2014 09:49:03 +0300 Subject: [PATCH] prepare for next version 2.1.0 --- build/Makefile | 2 +- cds/version.h | 4 ++-- change.log | 3 +++ doxygen/cds.doxy | 2 +- projects/android/jni/Android.mk | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build/Makefile b/build/Makefile index b0e9430f..bc902ab7 100644 --- a/build/Makefile +++ b/build/Makefile @@ -5,7 +5,7 @@ .SUFFIXES:.cpp .c .ro # make_distrib.pl substitutes the correct version -VERSION=2.0.0 +VERSION=2.1.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 afe0188a..21ca2ac1 100644 --- a/cds/version.h +++ b/cds/version.h @@ -5,14 +5,14 @@ // cds library version -#define CDS_VERSION 0x020000 +#define CDS_VERSION 0x020100 #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.0.0" +#define CDS_VERSION_STRING "2.1.0" #endif // #ifndef __CDS_VERSION_H diff --git a/change.log b/change.log index 8025448e..08ef29fe 100644 --- a/change.log +++ b/change.log @@ -1,3 +1,6 @@ +2.1.0 + TODO + 2.0.0 30.12.2014 General release - the library has been rewritten to support at least C++11. Compilers: GCC 4.8+, clang 3.3+, diff --git a/doxygen/cds.doxy b/doxygen/cds.doxy index 281d6be5..6e2578af 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.0.0 +PROJECT_NUMBER = 2.1.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 96cbe6af..99f2eff9 100644 --- a/projects/android/jni/Android.mk +++ b/projects/android/jni/Android.mk @@ -1,5 +1,5 @@ - CDS_LIBRARY_VERSION := 2.0.0 + CDS_LIBRARY_VERSION := 2.1.0 LOCAL_PATH := $(call my-dir) CDS_ROOT_DIR = $(LOCAL_PATH)/../../.. -- 2.34.1