jansson 2.9

This commit is contained in:
Petri Lehtinen 2016-09-18 14:35:05 +03:00
parent 074bb3838f
commit b02db47881
6 changed files with 30 additions and 6 deletions

22
CHANGES
View File

@ -1,3 +1,25 @@
Version 2.9
===========
Released 2016-09-18
* New features:
- Add ``json_auto_t`` to automatically decref a value that goes out
of scope. Available only on GCC and Clang. (#301)
* Build:
- Fix CMake build (at least on Linux) by removing conflicting
jansson_config.h from the distribution (#306)
- Change CMake install target generation to be optional (#305)
* Documentation:
- Small documentation fixes.
Version 2.8 Version 2.8
=========== ===========

View File

@ -86,10 +86,10 @@ endif (WIN32)
# set (JANSSON_VERSION "2.3.1") # set (JANSSON_VERSION "2.3.1")
# set (JANSSON_SOVERSION 2) # set (JANSSON_SOVERSION 2)
set(JANSSON_DISPLAY_VERSION "2.8") set(JANSSON_DISPLAY_VERSION "2.9")
# This is what is required to match the same numbers as automake's # This is what is required to match the same numbers as automake's
set(JANSSON_VERSION "4.8.0") set(JANSSON_VERSION "4.9.0")
set(JANSSON_SOVERSION 4) set(JANSSON_SOVERSION 4)
# for CheckFunctionKeywords # for CheckFunctionKeywords

View File

@ -1,5 +1,5 @@
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_INIT([jansson], [2.8], [petri@digip.org]) AC_INIT([jansson], [2.9], [petri@digip.org])
AC_CONFIG_AUX_DIR([.]) AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([1.10 foreign]) AM_INIT_AUTOMAKE([1.10 foreign])

View File

@ -256,6 +256,8 @@ returns an error status.
Scope Dereferencing Scope Dereferencing
------------------- -------------------
.. versionadded:: 2.9
It is possible to use the ``json_auto_t`` type to automatically It is possible to use the ``json_auto_t`` type to automatically
dereference a value at the end of a scope. For example:: dereference a value at the end of a scope. For example::

View File

@ -24,4 +24,4 @@ libjansson_la_SOURCES = \
libjansson_la_LDFLAGS = \ libjansson_la_LDFLAGS = \
-no-undefined \ -no-undefined \
-export-symbols-regex '^json_' \ -export-symbols-regex '^json_' \
-version-info 12:0:8 -version-info 13:0:9

View File

@ -21,11 +21,11 @@ extern "C" {
/* version */ /* version */
#define JANSSON_MAJOR_VERSION 2 #define JANSSON_MAJOR_VERSION 2
#define JANSSON_MINOR_VERSION 8 #define JANSSON_MINOR_VERSION 9
#define JANSSON_MICRO_VERSION 0 #define JANSSON_MICRO_VERSION 0
/* Micro version is omitted if it's 0 */ /* Micro version is omitted if it's 0 */
#define JANSSON_VERSION "2.8" #define JANSSON_VERSION "2.9"
/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */ for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */