Merge pull request #2285 from bluca/bump_versions

Problem: 4.2.1 is out, time to bump versions
This commit is contained in:
Constantin Rack 2016-12-31 18:25:36 +01:00 committed by GitHub
commit c38fde00a0
4 changed files with 8 additions and 3 deletions

View File

@ -745,7 +745,7 @@ else ()
COMPILE_DEFINITIONS "DLL_EXPORT" COMPILE_DEFINITIONS "DLL_EXPORT"
PUBLIC_HEADER "${public_headers}" PUBLIC_HEADER "${public_headers}"
VERSION ${ZMQ_VERSION} VERSION ${ZMQ_VERSION}
SOVERSION "5.1.1" SOVERSION "5.1.2"
OUTPUT_NAME "libzmq" OUTPUT_NAME "libzmq"
PREFIX "") PREFIX "")
if (ZMQ_BUILD_FRAMEWORK) if (ZMQ_BUILD_FRAMEWORK)

4
NEWS
View File

@ -1,3 +1,7 @@
0MQ version 4.2.2 stable, released on 20xx/xx/xx
=============================================
0MQ version 4.2.1 stable, released on 2016/12/31 0MQ version 4.2.1 stable, released on 2016/12/31
============================================= =============================================

View File

@ -39,9 +39,10 @@ AC_SUBST(PACKAGE_VERSION)
# ZeroMQ version 4.1: 5:0:0 (ABI version 5) # ZeroMQ version 4.1: 5:0:0 (ABI version 5)
# ZeroMQ version 4.2.0: 6:0:1 (ABI version 5) # ZeroMQ version 4.2.0: 6:0:1 (ABI version 5)
# ZeroMQ version 4.2.1: 6:1:1 (ABI version 5) # ZeroMQ version 4.2.1: 6:1:1 (ABI version 5)
# ZeroMQ version 4.2.2: 6:2:1 (ABI version 5)
# #
# libzmq -version-info current:revision:age # libzmq -version-info current:revision:age
LTVER="6:1:1" LTVER="6:2:1"
AC_SUBST(LTVER) AC_SUBST(LTVER)
# Take a copy of original flags # Take a copy of original flags

View File

@ -41,7 +41,7 @@
/* Version macros for compile-time API version detection */ /* Version macros for compile-time API version detection */
#define ZMQ_VERSION_MAJOR 4 #define ZMQ_VERSION_MAJOR 4
#define ZMQ_VERSION_MINOR 2 #define ZMQ_VERSION_MINOR 2
#define ZMQ_VERSION_PATCH 1 #define ZMQ_VERSION_PATCH 2
#define ZMQ_MAKE_VERSION(major, minor, patch) \ #define ZMQ_MAKE_VERSION(major, minor, patch) \
((major) * 10000 + (minor) * 100 + (patch)) ((major) * 10000 + (minor) * 100 + (patch))