5 Commits

Author SHA1 Message Date
Petri Lehtinen
e9ebfa7e77 jansson 2.13.1 2020-05-07 21:38:59 +03:00
Petri Lehtinen
3f4d948652 Merge pull request #535 from xry111/clang-format-check-dist-fix
add `scripts` directory to EXTRA_DIST
2020-05-07 21:29:30 +03:00
Petri Lehtinen
a839d3cad6 Merge pull request #534 from xry111/shared_lib_interface_fix
add jansson_* to shared library exports
2020-05-07 21:28:47 +03:00
Xℹ Ruoyao
2d2efde34a add scripts directory to EXTRA_DIST 2020-05-06 18:01:19 +08:00
Xℹ Ruoyao
bcb6b6f3fd add jansson_* to shared library exports 2020-05-06 17:31:48 +08:00
8 changed files with 23 additions and 10 deletions

13
CHANGES
View File

@@ -1,3 +1,16 @@
Version 2.13.1
==============
Released 2020-05-07
* Build:
- Include `jansson_version_str()` and `jansson_version_cmp()` in
shared library. (#534)
- Include `scripts/` in tarball. (#535)
Version 2.13
============

View File

@@ -85,10 +85,10 @@ endif()
# set (JANSSON_VERSION "2.3.1")
# set (JANSSON_SOVERSION 2)
set(JANSSON_DISPLAY_VERSION "2.13")
set(JANSSON_DISPLAY_VERSION "2.13.1")
# This is what is required to match the same numbers as automake's
set(JANSSON_VERSION "4.12.0")
set(JANSSON_VERSION "4.13.0")
set(JANSSON_SOVERSION 4)
# for CheckFunctionKeywords

View File

@@ -1,4 +1,4 @@
EXTRA_DIST = CHANGES LICENSE README.rst CMakeLists.txt cmake android examples
EXTRA_DIST = CHANGES LICENSE README.rst CMakeLists.txt cmake android examples scripts
SUBDIRS = doc src test
# "make distcheck" builds the dvi target, so use it to check that the

View File

@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
AC_INIT([jansson], [2.13], [https://github.com/akheron/jansson/issues])
AC_INIT([jansson], [2.13.1], [https://github.com/akheron/jansson/issues])
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([1.10 foreign])

View File

@@ -48,7 +48,7 @@ copyright = u'2009-2020, Petri Lehtinen'
# built documents.
#
# The short X.Y version.
version = '2.13'
version = '2.13.1'
# The full version, including alpha/beta/rc tags.
release = version

View File

@@ -24,6 +24,6 @@ libjansson_la_SOURCES = \
version.c
libjansson_la_LDFLAGS = \
-no-undefined \
-export-symbols-regex '^json_' \
-version-info 16:0:12 \
-export-symbols-regex '^json_|^jansson_' \
-version-info 17:0:13 \
@JSON_BSYMBOLIC_LDFLAGS@

View File

@@ -22,10 +22,10 @@ extern "C" {
#define JANSSON_MAJOR_VERSION 2
#define JANSSON_MINOR_VERSION 13
#define JANSSON_MICRO_VERSION 0
#define JANSSON_MICRO_VERSION 1
/* Micro version is omitted if it's 0 */
#define JANSSON_VERSION "2.13"
#define JANSSON_VERSION "2.13.1"
/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */

View File

@@ -7,7 +7,7 @@ SOFILE="../src/.libs/libjansson.so"
# The list of symbols, which the shared object should export, is read
# from the def file, which is used in Windows builds
grep 'json_' $top_srcdir/src/jansson.def \
grep 'json_\|jansson_' $top_srcdir/src/jansson.def \
| sed -e 's/ //g' \
| sort \
>$test_log/exports