Browse Source

Update the master branch to version 0.15.99

tags/json-c-0.16-20220414
Eric Haszlakiewicz 5 years ago
parent
commit
de02d09c32
5 changed files with 29 additions and 11 deletions
  1. +3
    -3
      CMakeLists.txt
  2. +9
    -1
      ChangeLog
  3. +10
    -5
      RELEASE_CHECKLIST.txt
  4. +5
    -0
      json-c.sym
  5. +2
    -2
      json_c_version.h

+ 3
- 3
CMakeLists.txt View File

@@ -10,11 +10,11 @@ endif()
if (CMAKE_VERSION VERSION_LESS 3.0)
project(json-c)
set(PROJECT_VERSION_MAJOR "0")
set(PROJECT_VERSION_MINOR "14")
set(PROJECT_VERSION_MINOR "15")
set(PROJECT_VERSION_PATCH "99")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
else()
project(json-c LANGUAGES C VERSION 0.14.99)
project(json-c LANGUAGES C VERSION 0.15.99)
endif()

# If we've got 3.0 then it's good, let's provide support. Otherwise, leave it be.
@@ -417,7 +417,7 @@ add_library(${PROJECT_NAME}
${JSON_C_HEADERS}
)
set_target_properties(${PROJECT_NAME} PROPERTIES
VERSION 5.0.0
VERSION 5.1.0
SOVERSION 5)
list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
# If json-c is used as subroject it set to target correct interface -I flags and allow


+ 9
- 1
ChangeLog View File

@@ -1,7 +1,15 @@

Next Release 0.15
Next Release 0.16
=====================

...no changes yet...


***

0.15 (up to commit 870965e, 2020/07/26)
========================================

Deprecated and removed features:
--------------------------------
* Deprecate `array_list_new()` in favor of `array_list_new2()`


+ 10
- 5
RELEASE_CHECKLIST.txt View File

@@ -20,6 +20,8 @@
* Mention removed features in ChangeLog
* Consider re-adding backwards compatible support, through symbol
aliases and appropriate entries in json-c.sym
* Be sure any new symbols are listed in json-c.sym as part of
the _new_ release version.
* Update the AUTHORS file

git log -r 31ab57ca..HEAD | grep Author: | sed -e's/Author: //' ; cat AUTHORS ) | sort -u > A1
@@ -37,7 +39,7 @@
## Release creation

Start creating the new release:
release=0.15
release=0.16
git clone https://github.com/json-c/json-c json-c-${release}

mkdir distcheck
@@ -77,9 +79,10 @@ If we're doing a major release (SONAME bump), also bump the version

Generate the doxygen documentation:

doxygen
(cd ../distcheck && make doc)
cp -r -p ../distcheck/doc/{html,Doxyfile} doc/.
git add -f doc
git commit doc
git commit doc -m "Generate docs for the ${release} release"

------------

@@ -107,7 +110,7 @@ Tag the branch:
Go to Amazon S3 service at:
https://console.aws.amazon.com/s3/

Upload the two tarballs in the json-c_releases folder.
Upload the two tarballs in the json-c_releases/releases folder.
When uploading, use "Standard" storage class, and make the uploaded files publicly accessible.

Logout of Amazon S3, and verify that the files are visible.
@@ -127,9 +130,11 @@ Use ${release}.99 to indicate a version "newer" than anything on the branch:

Update RELEASE_CHECKLIST.txt, set release=${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 0.${release}.99"
git commit -a -m "Update the master branch to version ${release}.99"
git push

------------


+ 5
- 0
json-c.sym View File

@@ -163,3 +163,8 @@ JSONC_0.15 {
json_object_array_shrink;
json_object_new_array_ext;
} JSONC_0.14;

JSONC_0.16 {
# global:
# ...new symbols here...
} JSONC_0.15;

+ 2
- 2
json_c_version.h View File

@@ -17,11 +17,11 @@ extern "C" {
#endif

#define JSON_C_MAJOR_VERSION 0
#define JSON_C_MINOR_VERSION 14
#define JSON_C_MINOR_VERSION 15
#define JSON_C_MICRO_VERSION 99
#define JSON_C_VERSION_NUM \
((JSON_C_MAJOR_VERSION << 16) | (JSON_C_MINOR_VERSION << 8) | JSON_C_MICRO_VERSION)
#define JSON_C_VERSION "0.14.99"
#define JSON_C_VERSION "0.15.99"

#ifndef JSON_EXPORT
#if defined(_MSC_VER)


Loading…
Cancel
Save