Skip to content
This repository has been archived by the owner on Dec 8, 2023. It is now read-only.

Commit

Permalink
Bump version to 2.1.6-beta everywhere
Browse files Browse the repository at this point in the history
- cmake basic
- cmake detecting from git -- event_fuzzy_version_from_git()
- autotools
- win32
- appveyor
  • Loading branch information
azat committed Aug 26, 2016
1 parent 81d2193 commit 51019e9
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ set(EVENT_ABI_LIBVERSION
set(EVENT_PACKAGE_VERSION
"${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}")

set(EVENT_NUMERIC_VERSION 0x02010500)
set(EVENT_NUMERIC_VERSION 0x02010600)

# only a subset of names can be used, defaults to "beta"
set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE}
Expand Down
3 changes: 2 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 5:0:0
VERSION_INFO = 6:0:0

# History: RELEASE VERSION_INFO
# 2.0.1-alpha -- 2.0 1:0:0
Expand Down Expand Up @@ -65,6 +65,7 @@ VERSION_INFO = 5:0:0
# 2.1.3-alpha -- 2.1 3:0:0 (ABI changed slightly)
# 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)

# ABI version history for this package effectively restarts every time
# we change RELEASE. Version 1.4.x had RELEASE of 1.4.
Expand Down
4 changes: 2 additions & 2 deletions WIN32-Code/nmake/event2/event-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
/* #undef EVENT__HAVE_WORKING_KQUEUE */

/* Numeric representation of the version */
#define EVENT__NUMERIC_VERSION 0x02010500
#define EVENT__NUMERIC_VERSION 0x02010600

/* Name of package */
#define EVENT__PACKAGE "libevent"
Expand Down Expand Up @@ -331,7 +331,7 @@
#define EVENT__TIME_WITH_SYS_TIME 1

/* Version number of package */
#define EVENT__VERSION "2.1.5-beta"
#define EVENT__VERSION "2.1.6-beta"

/* Define to appropriate substitue if compiler doesnt have __func__ */
#define EVENT____func__ __FUNCTION__
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 2.1.5.{build}
version: 2.1.6.{build}

os: Visual Studio 2015

Expand Down
2 changes: 1 addition & 1 deletion cmake/VersionViaGit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 5)
set(EVENT_GIT___VERSION_PATCH 6)
set(EVENT_GIT___VERSION_STAGE "beta")

find_package(Git)
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dnl See LICENSE for copying information.
dnl
dnl Original version Dug Song <[email protected]>

AC_INIT(libevent,2.1.5-beta)
AC_INIT(libevent,2.1.6-beta)
AC_PREREQ(2.59)
AC_CONFIG_SRCDIR(event.c)

Expand All @@ -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, 0x02010500, [Numeric representation of the version])
AC_DEFINE(NUMERIC_VERSION, 0x02010600, [Numeric representation of the version])

dnl Initialize prefix.
if test "$prefix" = "NONE"; then
Expand Down

0 comments on commit 51019e9

Please sign in to comment.