diff options
| author | Milo Yip <miloyip@gmail.com> | 2015-04-22 05:26:03 +0300 |
|---|---|---|
| committer | Milo Yip <miloyip@gmail.com> | 2015-04-22 05:26:03 +0300 |
| commit | 7f43373a1234f5f773bc6d43a5e3d1e4cddcf9f6 (patch) | |
| tree | 7619c071f32d1c461874ce3050e2bb2aa130535f | |
| parent | de137a2567c06b7c277e894ba76235efbdf5cfdc (diff) | |
| parent | b2e53523bf4a12fe120ceaa16e3b5c7da1672f41 (diff) | |
Merge pull request #311 from miloyip/issue310_versionmacrov1.0.0
RapidJSON v1.0.0
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | include/rapidjson/rapidjson.h | 40 | ||||
| -rw-r--r-- | readme.md | 3 | ||||
| -rw-r--r-- | readme.zh-cn.md | 2 | ||||
| -rw-r--r-- | test/unittest/unittest.cpp | 3 |
6 files changed, 46 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cf6b46fb..559312bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules) PROJECT(RapidJSON CXX) -set(LIB_MAJOR_VERSION "0") -set(LIB_MINOR_VERSION "12") +set(LIB_MAJOR_VERSION "1") +set(LIB_MINOR_VERSION "0") set(LIB_PATCH_VERSION "0") set(LIB_VERSION_STRING "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_PATCH_VERSION}") diff --git a/appveyor.yml b/appveyor.yml index d1a91089..890f9d9a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.12.{build} +version: 1.0.0.{build} configuration: - Debug diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h index 4351aeae..938a3ce4 100644 --- a/include/rapidjson/rapidjson.h +++ b/include/rapidjson/rapidjson.h @@ -17,7 +17,7 @@ /*!\file rapidjson.h
\brief common definitions and configuration
-
+
\see RAPIDJSON_CONFIG
*/
@@ -40,6 +40,40 @@ #include <cstring> // memset(), memcpy(), memmove(), memcmp()
///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_VERSION_STRING
+//
+// ALWAYS synchronize the following 3 macros with corresponding variables in /CMakeLists.txt.
+//
+
+//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
+// token stringification
+#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)
+#define RAPIDJSON_DO_STRINGIFY(x) #x
+//!@endcond
+
+/*! \def RAPIDJSON_MAJOR_VERSION
+ \ingroup RAPIDJSON_CONFIG
+ \brief Major version of RapidJSON in integer.
+*/
+/*! \def RAPIDJSON_MINOR_VERSION
+ \ingroup RAPIDJSON_CONFIG
+ \brief Minor version of RapidJSON in integer.
+*/
+/*! \def RAPIDJSON_PATCH_VERSION
+ \ingroup RAPIDJSON_CONFIG
+ \brief Patch version of RapidJSON in integer.
+*/
+/*! \def RAPIDJSON_VERSION_STRING
+ \ingroup RAPIDJSON_CONFIG
+ \brief Version of RapidJSON in "<major>.<minor>.<patch>" string format.
+*/
+#define RAPIDJSON_MAJOR_VERSION 1
+#define RAPIDJSON_MINOR_VERSION 0
+#define RAPIDJSON_PATCH_VERSION 0
+#define RAPIDJSON_VERSION_STRING \
+ RAPIDJSON_STRINGIFY(RAPIDJSON_MAJOR_VERSION.RAPIDJSON_MINOR_VERSION.RAPIDJSON_PATCH_VERSION)
+
+///////////////////////////////////////////////////////////////////////////////
// RAPIDJSON_NAMESPACE_(BEGIN|END)
/*! \def RAPIDJSON_NAMESPACE
\ingroup RAPIDJSON_CONFIG
@@ -353,10 +387,6 @@ RAPIDJSON_NAMESPACE_END #define RAPIDJSON_VERSION_CODE(x,y,z) \
(((x)*100000) + ((y)*100) + (z))
-// token stringification
-#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)
-#define RAPIDJSON_DO_STRINGIFY(x) #x
-
///////////////////////////////////////////////////////////////////////////////
// RAPIDJSON_DIAG_PUSH/POP, RAPIDJSON_DIAG_OFF
@@ -1,4 +1,7 @@  + + + ## A fast JSON parser/generator for C++ with both SAX/DOM style API Tencent is pleased to support the open source community by making RapidJSON available. diff --git a/readme.zh-cn.md b/readme.zh-cn.md index 91ab10dd..be3849a7 100644 --- a/readme.zh-cn.md +++ b/readme.zh-cn.md @@ -1,5 +1,7 @@  + + Tencent is pleased to support the open source community by making RapidJSON available. Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved. diff --git a/test/unittest/unittest.cpp b/test/unittest/unittest.cpp index c475179e..4e3bc11e 100644 --- a/test/unittest/unittest.cpp +++ b/test/unittest/unittest.cpp @@ -13,10 +13,13 @@ // specific language governing permissions and limitations under the License.
#include "unittest.h"
+#include "rapidjson/rapidjson.h"
int main(int argc, char **argv) {
::testing::InitGoogleTest(&argc, argv);
+ std::cout << "RapidJSON v" << RAPIDJSON_VERSION_STRING << std::endl;
+
#if _MSC_VER
_CrtMemState memoryState = { 0 };
_CrtMemCheckpoint(&memoryState);
|