Browse Source

Update the master branch to version 0.0.14.99

tags/json-c-0.15-20200726
Eric Haszlakiewicz 5 years ago
parent
commit
2babb5b780
6 changed files with 22 additions and 10 deletions
  1. +3
    -3
      CMakeLists.txt
  2. +12
    -0
      ChangeLog
  3. +1
    -1
      Doxyfile
  4. +1
    -1
      RELEASE_CHECKLIST.txt
  5. +3
    -3
      config.h.win32
  6. +2
    -2
      json_c_version.h

+ 3
- 3
CMakeLists.txt View File

@@ -7,7 +7,7 @@ if(POLICY CMP0048)
endif() endif()


# JSON-C library is C only project. # JSON-C library is C only project.
project(json-c LANGUAGES C VERSION 0.13.99)
project(json-c LANGUAGES C VERSION 0.14.99)


# If we've got 3.0 then it's good, let's provide support. Otherwise, leave it be. # If we've got 3.0 then it's good, let's provide support. Otherwise, leave it be.
if(POLICY CMP0038) if(POLICY CMP0038)
@@ -381,8 +381,8 @@ add_library(${PROJECT_NAME}
${JSON_C_HEADERS} ${JSON_C_HEADERS}
) )
set_target_properties(${PROJECT_NAME} PROPERTIES set_target_properties(${PROJECT_NAME} PROPERTIES
VERSION 4.0.0
SOVERSION 4)
VERSION 5.0.0
SOVERSION 5)


# 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
# to build external target without extra include_directories(...) # to build external target without extra include_directories(...)


+ 12
- 0
ChangeLog View File

@@ -1,4 +1,16 @@


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

Deprecated and removed features:
--------------------------------
...none yet...

Other changes
--------------
...none yet...

***


0.14 (up to commit 9ed00a6, 2020/04/14) 0.14 (up to commit 9ed00a6, 2020/04/14)
========================================= =========================================


+ 1
- 1
Doxyfile View File

@@ -38,7 +38,7 @@ PROJECT_NAME = json-c
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.


PROJECT_NUMBER = 0.13.99
PROJECT_NUMBER = 0.14.99


# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a


+ 1
- 1
RELEASE_CHECKLIST.txt View File

@@ -31,7 +31,7 @@
## Release creation ## Release creation


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


mkdir distcheck mkdir distcheck


+ 3
- 3
config.h.win32 View File

@@ -177,7 +177,7 @@
#define PACKAGE_NAME "JSON C Library" #define PACKAGE_NAME "JSON C Library"


/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "JSON C Library 0.13.99"
#define PACKAGE_STRING "JSON C Library 0.14.99"


/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "json-c" #define PACKAGE_TARNAME "json-c"
@@ -186,13 +186,13 @@
#define PACKAGE_URL "https://github.com/json-c/json-c" #define PACKAGE_URL "https://github.com/json-c/json-c"


/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "0.13.99"
#define PACKAGE_VERSION "0.14.99"


/* Define to 1 if you have the ANSI C header files. */ /* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1


/* Version number of package */ /* Version number of package */
#define VERSION "0.13.99"
#define VERSION "0.14.99"


/* Define to empty if `const' does not conform to ANSI C. */ /* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */ /* #undef const */


+ 2
- 2
json_c_version.h View File

@@ -13,11 +13,11 @@
#define _json_c_version_h_ #define _json_c_version_h_


#define JSON_C_MAJOR_VERSION 0 #define JSON_C_MAJOR_VERSION 0
#define JSON_C_MINOR_VERSION 13
#define JSON_C_MINOR_VERSION 14
#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.13.99"
#define JSON_C_VERSION "0.14.99"


#ifndef JSON_EXPORT #ifndef JSON_EXPORT
#if defined(_MSC_VER) #if defined(_MSC_VER)


Loading…
Cancel
Save