cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-04 09:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bump version to 2.1.7-beta everywhere

Browse Source 
- cmake basic
- cmake detecting from git -- event_fuzzy_version_from_git()
- autotools
- win32
- appveyor
This commit is contained in:
Azat Khuzhin 2016-11-02 00:31:31 +03:00
parent 13ea9f5ee5
commit f4489b8323
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -73,7 +73,7 @@ set(EVENT_ABI_LIBVERSION
set(EVENT_PACKAGE_VERSION set(EVENT_PACKAGE_VERSION
"${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}") "${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" # only a subset of names can be used, defaults to "beta"
set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE} set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE}

3
Makefile.am
View File

@ -34,7 +34,7 @@ RELEASE = -release 2.1
# #
# Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES # Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES
# UNLESS YOU REALLY REALLY HAVE TO. # UNLESS YOU REALLY REALLY HAVE TO.
VERSION_INFO = 6:0:0 VERSION_INFO = 6:1:0
# History: RELEASE VERSION_INFO # History: RELEASE VERSION_INFO
# 2.0.1-alpha -- 2.0 1:0:0 # 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.4-alpha -- 2.1 4:0:0 (ABI changed slightly)
# 2.1.5-beta -- 2.1 5: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.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 # ABI version history for this package effectively restarts every time
# we change RELEASE. Version 1.4.x had RELEASE of 1.4. # we change RELEASE. Version 1.4.x had RELEASE of 1.4.

4
WIN32-Code/nmake/event2/event-config.h
View File

@ -274,7 +274,7 @@
/* #undef EVENT__HAVE_WORKING_KQUEUE */ /* #undef EVENT__HAVE_WORKING_KQUEUE */
/* Numeric representation of the version */ /* Numeric representation of the version */
#define EVENT__NUMERIC_VERSION 0x02010600 #define EVENT__NUMERIC_VERSION 0x02010700
/* Name of package */ /* Name of package */
#define EVENT__PACKAGE "libevent" #define EVENT__PACKAGE "libevent"
@ -331,7 +331,7 @@
#define EVENT__TIME_WITH_SYS_TIME 1 #define EVENT__TIME_WITH_SYS_TIME 1
/* Version number of package */ /* 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 to appropriate substitue if compiler doesnt have __func__ */
#define EVENT____func__ __FUNCTION__ #define EVENT____func__ __FUNCTION__

2
appveyor.yml
View File

@ -1,4 +1,4 @@
version: 2.1.6.{build} version: 2.1.7.{build}
os: Visual Studio 2015 os: Visual Studio 2015

2
cmake/VersionViaGit.cmake
View File

@ -27,7 +27,7 @@ macro(event_fuzzy_version_from_git)
# set our defaults. # set our defaults.
set(EVENT_GIT___VERSION_MAJOR 2) set(EVENT_GIT___VERSION_MAJOR 2)
set(EVENT_GIT___VERSION_MINOR 1) set(EVENT_GIT___VERSION_MINOR 1)
set(EVENT_GIT___VERSION_PATCH 6) set(EVENT_GIT___VERSION_PATCH 7)
set(EVENT_GIT___VERSION_STAGE "beta") set(EVENT_GIT___VERSION_STAGE "beta")
find_package(Git) find_package(Git)

4
configure.ac
View File

@ -5,7 +5,7 @@ dnl See LICENSE for copying information.
dnl dnl
dnl Original version Dug Song <dugsong@monkey.org> dnl Original version Dug Song <dugsong@monkey.org>
AC_INIT(libevent,2.1.6-beta) AC_INIT(libevent,2.1.7-beta)
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_CONFIG_SRCDIR(event.c) 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 dnl AM_SILENT_RULES req. automake 1.11. [no] defaults V=1
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS(config.h evconfig-private.h:evconfig-private.h.in) 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. dnl Initialize prefix.
if test "$prefix" = "NONE"; then if test "$prefix" = "NONE"; then