From: Azat Khuzhin Date: Tue, 1 Nov 2016 21:31:31 +0000 (+0300) Subject: Bump version to 2.1.7-beta everywhere X-Git-Tag: release-2.1.7-rc^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4489b8323cda0bf8eed7c1353911a852d7a947c;p=libevent Bump version to 2.1.7-beta everywhere - cmake basic - cmake detecting from git -- event_fuzzy_version_from_git() - autotools - win32 - appveyor --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 99be4435..7a839dec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ set(EVENT_ABI_LIBVERSION set(EVENT_PACKAGE_VERSION "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}") -set(EVENT_NUMERIC_VERSION 0x02010600) +set(EVENT_NUMERIC_VERSION 0x02010700) # only a subset of names can be used, defaults to "beta" set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE} diff --git a/Makefile.am b/Makefile.am index 98c9ea6e..c7f1d19a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ RELEASE = -release 2.1 # # Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES # UNLESS YOU REALLY REALLY HAVE TO. -VERSION_INFO = 6:0:0 +VERSION_INFO = 6:1:0 # History: RELEASE VERSION_INFO # 2.0.1-alpha -- 2.0 1:0:0 @@ -66,6 +66,7 @@ VERSION_INFO = 6:0:0 # 2.1.4-alpha -- 2.1 4:0:0 (ABI changed slightly) # 2.1.5-beta -- 2.1 5:0:0 (ABI changed slightly) # 2.1.6-beta -- 2.1 6:0:0 (ABI changed slightly) +# 2.1.7-beta -- 2.1 6:1:0 (ABI changed slightly) # ABI version history for this package effectively restarts every time # we change RELEASE. Version 1.4.x had RELEASE of 1.4. diff --git a/WIN32-Code/nmake/event2/event-config.h b/WIN32-Code/nmake/event2/event-config.h index a6dbfdf7..d96dfba1 100644 --- a/WIN32-Code/nmake/event2/event-config.h +++ b/WIN32-Code/nmake/event2/event-config.h @@ -274,7 +274,7 @@ /* #undef EVENT__HAVE_WORKING_KQUEUE */ /* Numeric representation of the version */ -#define EVENT__NUMERIC_VERSION 0x02010600 +#define EVENT__NUMERIC_VERSION 0x02010700 /* Name of package */ #define EVENT__PACKAGE "libevent" @@ -331,7 +331,7 @@ #define EVENT__TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define EVENT__VERSION "2.1.6-beta" +#define EVENT__VERSION "2.1.7-beta" /* Define to appropriate substitue if compiler doesnt have __func__ */ #define EVENT____func__ __FUNCTION__ diff --git a/appveyor.yml b/appveyor.yml index f2bcc589..2b56b633 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.1.6.{build} +version: 2.1.7.{build} os: Visual Studio 2015 diff --git a/cmake/VersionViaGit.cmake b/cmake/VersionViaGit.cmake index 442a0a68..c0f83d55 100644 --- a/cmake/VersionViaGit.cmake +++ b/cmake/VersionViaGit.cmake @@ -27,7 +27,7 @@ macro(event_fuzzy_version_from_git) # set our defaults. set(EVENT_GIT___VERSION_MAJOR 2) set(EVENT_GIT___VERSION_MINOR 1) - set(EVENT_GIT___VERSION_PATCH 6) + set(EVENT_GIT___VERSION_PATCH 7) set(EVENT_GIT___VERSION_STAGE "beta") find_package(Git) diff --git a/configure.ac b/configure.ac index d4c0d680..78a4edcc 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl See LICENSE for copying information. dnl dnl Original version Dug Song -AC_INIT(libevent,2.1.6-beta) +AC_INIT(libevent,2.1.7-beta) AC_PREREQ(2.59) AC_CONFIG_SRCDIR(event.c) @@ -25,7 +25,7 @@ AM_INIT_AUTOMAKE(m4_esyscmd([echo foreign 1.9 subdir-objects dnl AM_SILENT_RULES req. automake 1.11. [no] defaults V=1 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS(config.h evconfig-private.h:evconfig-private.h.in) -AC_DEFINE(NUMERIC_VERSION, 0x02010600, [Numeric representation of the version]) +AC_DEFINE(NUMERIC_VERSION, 0x02010700, [Numeric representation of the version]) dnl Initialize prefix. if test "$prefix" = "NONE"; then