Permalink
Browse files

jansson 2.5

  • Loading branch information...
1 parent 9f9c9fe commit 641002da378d922539d655a8017ee2ee0f6b940c @akheron committed Sep 19, 2013
Showing with 67 additions and 8 deletions.
  1. +59 −0 CHANGES
  2. +2 −2 CMakeLists.txt
  3. +1 −1 configure.ac
  4. +1 −1 doc/conf.py
  5. +1 −1 src/Makefile.am
  6. +3 −3 src/jansson.h
View
59 CHANGES
@@ -1,3 +1,62 @@
+Version 2.5
+===========
+
+Released 2013-09-19
+
+* New features:
+
+ - `json_pack()` and friends: Add format specifiers ``s#``, ``+`` and
+ ``+#``.
+
+ - Add ``JSON_DECODE_INT_AS_REAL`` decoding flag to treat all numbers
+ as real in the decoder (#123).
+
+ - Add `json_array_foreach()`, paralleling `json_object_foreach()`
+ (#118).
+
+* Bug fixes:
+
+ - `json_dumps()` and friends: Don't crash if json is *NULL* and
+ ``JSON_ENCODE_ANY`` is set.
+
+ - Fix a theoretical integer overflow in `jsonp_strdup()`.
+
+ - Fix `l_isxdigit()` macro (#97).
+
+ - Fix an off-by-one error in `json_array_remove()`.
+
+* Build:
+
+ - Support CMake in addition to GNU Autotools (#106, #107, #112,
+ #115, #120, #127).
+
+ - Support building for Android (#109).
+
+ - Don't use ``-Werror`` by default.
+
+ - Support building and testing with VPATH (#93).
+
+ - Fix compilation when ``NDEBUG`` is defined (#128)
+
+* Tests:
+
+ - Fix a refleak in ``test/bin/json_process.c``.
+
+* Documentation:
+
+ - Clarify the return value of `json_load_callback_t`.
+
+ - Document how to circumvent problems with separate heaps on Windows.
+
+ - Fix memory leaks and warnings in ``github_commits.c``.
+
+ - Use `json_decref()` properly in tutorial.
+
+* Other:
+
+ - Make it possible to forward declare ``struct json_t``.
+
+
Version 2.4
===========
View
4 CMakeLists.txt
@@ -76,10 +76,10 @@ endif (WIN32)
# set (JANSSON_VERSION "2.3.1")
# set (JANSSON_SOVERSION 2)
-set(JANSSON_DISPLAY_VERSION "2.5-dev")
+set(JANSSON_DISPLAY_VERSION "2.5")
# This is what is required to match the same numbers as automake's
-set (JANSSON_VERSION "4.3.1")
+set (JANSSON_VERSION "4.5.0")
set (JANSSON_SOVERSION 4)
# for CheckFunctionKeywords
View
2 configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([jansson], [2.5-dev], [petri@digip.org])
+AC_INIT([jansson], [2.5], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])
View
2 doc/conf.py
@@ -48,7 +48,7 @@
# built documents.
#
# The short X.Y version.
-version = '2.5-dev'
+version = '2.5'
# The full version, including alpha/beta/rc tags.
release = version
View
2 src/Makefile.am
@@ -21,4 +21,4 @@ libjansson_la_SOURCES = \
libjansson_la_LDFLAGS = \
-no-undefined \
-export-symbols-regex '^json_' \
- -version-info 8:0:4
+ -version-info 9:0:5
View
6 src/jansson.h
@@ -21,11 +21,11 @@ extern "C" {
/* version */
#define JANSSON_MAJOR_VERSION 2
-#define JANSSON_MINOR_VERSION 4
-#define JANSSON_MICRO_VERSION 99
+#define JANSSON_MINOR_VERSION 5
+#define JANSSON_MICRO_VERSION 0
/* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION "2.5-dev"
+#define JANSSON_VERSION "2.5"
/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */

0 comments on commit 641002d

Please sign in to comment.