@@ -10,7 +10,7 @@ cmake_policy(SET CMP0048 NEW) | |||||
# JSON-C library is C only project. | # JSON-C library is C only project. | ||||
# PROJECT_VERSION{,_MAJOR,_MINOR,_PATCH} set by project(): | # PROJECT_VERSION{,_MAJOR,_MINOR,_PATCH} set by project(): | ||||
project(json-c LANGUAGES C VERSION 0.16.99) | |||||
project(json-c LANGUAGES C VERSION 0.17.99) | |||||
# Targets may not link directly to themselves. | # Targets may not link directly to themselves. | ||||
cmake_policy(SET CMP0038 NEW) | cmake_policy(SET CMP0038 NEW) | ||||
@@ -472,7 +472,7 @@ add_library(${PROJECT_NAME} | |||||
${JSON_C_HEADERS} | ${JSON_C_HEADERS} | ||||
) | ) | ||||
set_target_properties(${PROJECT_NAME} PROPERTIES | set_target_properties(${PROJECT_NAME} PROPERTIES | ||||
VERSION 5.2.0 | |||||
VERSION 5.3.0 | |||||
SOVERSION 5) | SOVERSION 5) | ||||
list(APPEND CMAKE_TARGETS ${PROJECT_NAME}) | list(APPEND CMAKE_TARGETS ${PROJECT_NAME}) | ||||
# If json-c is used as subroject it set to target correct interface -I flags and allow | # If json-c is used as subroject it set to target correct interface -I flags and allow | ||||
@@ -141,12 +141,10 @@ Use ${release}.99 to indicate a version "newer" than anything on the branch: | |||||
Update the version in json_c_version.h | Update the version in json_c_version.h | ||||
Update the version in CMakeLists.txt | Update the version in CMakeLists.txt | ||||
Update RELEASE_CHECKLIST.txt, set release=${release}+1 | |||||
Update the set_target_properties() line in CmakeLists.txt to match the release branch. | |||||
Add a new empty section to the json-c.sym file, for ${release}+1 | Add a new empty section to the json-c.sym file, for ${release}+1 | ||||
Update the set_target_properties() line in CmakeLists.txt to match the release branch. | |||||
git commit -a -m "Update the master branch to version ${release}.99" | git commit -a -m "Update the master branch to version ${release}.99" | ||||
git push | git push | ||||
@@ -176,3 +176,7 @@ JSONC_0.17 { | |||||
json_patch_apply; | json_patch_apply; | ||||
# array_list_insert_idx is intentionally not exported | # array_list_insert_idx is intentionally not exported | ||||
} JSONC_0.16; | } JSONC_0.16; | ||||
JSONC_0.18 { | |||||
# global: | |||||
} JSONC_0.17; |
@@ -17,11 +17,11 @@ extern "C" { | |||||
#endif | #endif | ||||
#define JSON_C_MAJOR_VERSION 0 | #define JSON_C_MAJOR_VERSION 0 | ||||
#define JSON_C_MINOR_VERSION 16 | |||||
#define JSON_C_MINOR_VERSION 17 | |||||
#define JSON_C_MICRO_VERSION 99 | #define JSON_C_MICRO_VERSION 99 | ||||
#define JSON_C_VERSION_NUM \ | #define JSON_C_VERSION_NUM \ | ||||
((JSON_C_MAJOR_VERSION << 16) | (JSON_C_MINOR_VERSION << 8) | JSON_C_MICRO_VERSION) | ((JSON_C_MAJOR_VERSION << 16) | (JSON_C_MINOR_VERSION << 8) | JSON_C_MICRO_VERSION) | ||||
#define JSON_C_VERSION "0.16.99" | |||||
#define JSON_C_VERSION "0.17.99" | |||||
#ifndef JSON_EXPORT | #ifndef JSON_EXPORT | ||||
#if defined(_MSC_VER) && defined(JSON_C_DLL) | #if defined(_MSC_VER) && defined(JSON_C_DLL) | ||||