diff options
| author | Nathaniel McCallum <npmccallum@redhat.com> | 2017-03-02 08:50:20 -0500 |
|---|---|---|
| committer | Petri Lehtinen <petri.lehtinen@nidos.fi> | 2017-03-02 20:49:42 +0200 |
| commit | b23201bb1a566d7e4ea84b76b3dcf2efcc025dac (patch) | |
| tree | bf50f2b4d9cc199687bf7d68422e1a53b19f5cde | |
| parent | df454e3cf0a74c4358cb5437abbe8ec176018f86 (diff) | |
| download | jansson-b23201bb1a566d7e4ea84b76b3dcf2efcc025dac.zip jansson-b23201bb1a566d7e4ea84b76b3dcf2efcc025dac.tar.gz jansson-b23201bb1a566d7e4ea84b76b3dcf2efcc025dac.tar.bz2 | |
jansson 2.10v2.10
| -rw-r--r-- | CHANGES | 25 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/jansson.h | 4 |
6 files changed, 32 insertions, 7 deletions
@@ -1,3 +1,28 @@ +Version 2.10 +============ + +Released 2017-03-02 + +* New features: + + - Add JSON_EMBED encoding flag allowing arrays and objects to be encoded + into existing streams (#329). + + - Add `json_dumpb()` function for dumping to a pre-allocated buffer (#328). + + - Add `json_dumpfd()` and `json_loadfd()` functions for dumping to streaming + file descriptors (#328). + + - Add support for parsing buffers larger than 2GB (#309). + +* Build: + + - Fix CMake build when LONG_LONG_INT is defined as "" (#321) + +* Other: + + - Internal code cleanup (#311, #314) + Version 2.9 =========== diff --git a/CMakeLists.txt b/CMakeLists.txt index e756eb6..b239333 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,10 +86,10 @@ endif (WIN32) # set (JANSSON_VERSION "2.3.1") # set (JANSSON_SOVERSION 2) -set(JANSSON_DISPLAY_VERSION "2.9") +set(JANSSON_DISPLAY_VERSION "2.10") # This is what is required to match the same numbers as automake's -set(JANSSON_VERSION "4.9.0") +set(JANSSON_VERSION "4.10.0") set(JANSSON_SOVERSION 4) # for CheckFunctionKeywords diff --git a/configure.ac b/configure.ac index f22ddac..d1c4faf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([jansson], [2.9], [petri@digip.org]) +AC_INIT([jansson], [2.10], [petri@digip.org]) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE([1.10 foreign]) diff --git a/doc/conf.py b/doc/conf.py index 419e9a4..5a66f3d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -48,7 +48,7 @@ copyright = u'2009-2016, Petri Lehtinen' # built documents. # # The short X.Y version. -version = '2.10-dev' +version = '2.10' # The full version, including alpha/beta/rc tags. release = version diff --git a/src/Makefile.am b/src/Makefile.am index 5a0c868..5516927 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,4 +24,4 @@ libjansson_la_SOURCES = \ libjansson_la_LDFLAGS = \ -no-undefined \ -export-symbols-regex '^json_' \ - -version-info 13:0:9 + -version-info 14:0:10 diff --git a/src/jansson.h b/src/jansson.h index cbe27a8..a5927bd 100644 --- a/src/jansson.h +++ b/src/jansson.h @@ -21,11 +21,11 @@ extern "C" { /* version */ #define JANSSON_MAJOR_VERSION 2 -#define JANSSON_MINOR_VERSION 9 +#define JANSSON_MINOR_VERSION 10 #define JANSSON_MICRO_VERSION 0 /* Micro version is omitted if it's 0 */ -#define JANSSON_VERSION "2.9" +#define JANSSON_VERSION "2.10" /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */ |