projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
57c5af0
)
Changed version to 2.2.0
author
khizmax
<libcds.dev@gmail.com>
Thu, 7 Jan 2016 10:28:40 +0000
(13:28 +0300)
committer
khizmax
<libcds.dev@gmail.com>
Thu, 7 Jan 2016 10:28:40 +0000
(13:28 +0300)
CMakeLists.txt
patch
|
blob
|
history
build/Makefile
patch
|
blob
|
history
cds/version.h
patch
|
blob
|
history
doxygen/cds.doxy
patch
|
blob
|
history
projects/android/jni/Android.mk
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 899578328ed4952aafbada0650b51ed4b3b4475e..b445413b5899f8f6f0dae85939b6a0f7f6d4486e 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-3,7
+3,7
@@
cmake_policy(SET CMP0016 NEW)
project(cds)
project(cds)
-set(PROJECT_VERSION 2.
1
.0)
+set(PROJECT_VERSION 2.
2
.0)
# Options
option(WITH_TESTS "Build unit tests" OFF)
# Options
option(WITH_TESTS "Build unit tests" OFF)
diff --git
a/build/Makefile
b/build/Makefile
index bb54ad54cf093e19761126e922e8917976b6de1f..0cf129b6b1952b1a77b81710aa29cb41c3071a70 100644
(file)
--- a/
build/Makefile
+++ b/
build/Makefile
@@
-5,7
+5,7
@@
.SUFFIXES:.cpp .c .ro
# make_distrib.pl substitutes the correct version
.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
# boost_thread lib used by test application.
# You may change the library name
diff --git
a/cds/version.h
b/cds/version.h
index 337ba6baa64942a66f5146df3d3b1a643f8d86b8..222f0e61e060bb5766a6a140f1524b2d9e866d8c 100644
(file)
--- a/
cds/version.h
+++ b/
cds/version.h
@@
-33,14
+33,14
@@
// cds library version
// cds library version
-#define CDS_VERSION 0x020
1
00
+#define CDS_VERSION 0x020
2
00
#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_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
#endif // #ifndef CDSLIB_VERSION_H
diff --git
a/doxygen/cds.doxy
b/doxygen/cds.doxy
index fd6a72d8eeb5115360147168f7de6a40f4ea0ded..297ca0dcc320017e2d9bc148a707ef54bb376b6b 100644
(file)
--- 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.
# 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.
# 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 99f2eff929fdf313c74f9f7e4eb72388ed3c4460..4505c042061017f2d08c6ef59e0d312cd7828cdd 100644
(file)
--- a/
projects/android/jni/Android.mk
+++ b/
projects/android/jni/Android.mk
@@
-1,5
+1,5
@@
\r
\r
- CDS_LIBRARY_VERSION := 2.
1
.0
\r
+ CDS_LIBRARY_VERSION := 2.
2
.0
\r
LOCAL_PATH := $(call my-dir)
\r
CDS_ROOT_DIR = $(LOCAL_PATH)/../../..
\r
\r
LOCAL_PATH := $(call my-dir)
\r
CDS_ROOT_DIR = $(LOCAL_PATH)/../../..
\r
\r