From a2edfc7df6210125fa51b0a89469a24f659425d0 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 4 Apr 2017 14:11:14 -0400 Subject: [PATCH] Add bt_version_get_*() functions to dynamically get the lib's version MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- configure.ac | 14 ++++++++++++-- include/babeltrace/babeltrace.h | 8 ++++---- lib/babeltrace.c | 19 +++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 84fae3c3..c3714659 100644 --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,24 @@ AC_PREREQ([2.50]) -AC_INIT([babeltrace],[2.0.0-pre],[jeremie dot galarneau at efficios dot com]) +m4_define([bt_version_major], [2]) +m4_define([bt_version_minor], [0]) +m4_define([bt_version_patch], [0]) +m4_define([bt_version_extra], [-pre]) +m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra) +AC_INIT([babeltrace],bt_version,[jeremie dot galarneau at efficios dot com]) # Following the numbering scheme proposed by libtool for the library version # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -AC_SUBST([BABELTRACE_LIBRARY_VERSION], [2:0:0]) +AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_version_major[:]bt_version_minor[:]bt_version_patch) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) +AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace library major version]) +AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace library minor version]) +AC_DEFINE([BT_VERSION_PATCH], bt_version_patch, [Babeltrace library patch version]) +AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace library extra version]) + AC_CANONICAL_TARGET AC_CANONICAL_HOST diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h index 365382e5..f2efdf52 100644 --- a/include/babeltrace/babeltrace.h +++ b/include/babeltrace/babeltrace.h @@ -25,9 +25,9 @@ * SOFTWARE. */ -#include -#include -#include -#include +extern int bt_version_get_major(void); +extern int bt_version_get_minor(void); +extern int bt_version_get_patch(void); +extern const char *bt_version_get_extra(void); #endif /* _BABELTRACE_H */ diff --git a/lib/babeltrace.c b/lib/babeltrace.c index 881e80d6..090fc3bc 100644 --- a/lib/babeltrace.c +++ b/lib/babeltrace.c @@ -40,3 +40,22 @@ void __attribute__((constructor)) init_babeltrace_lib(void) if (getenv("BABELTRACE_DEBUG")) babeltrace_debug = 1; } + +int bt_version_get_major(void) +{ + return BT_VERSION_MAJOR; +} + +int bt_version_get_minor(void) +{ + return BT_VERSION_MINOR; +} + +int bt_version_get_patch(void) { + return BT_VERSION_PATCH; +} + +const char *bt_version_get_extra(void) +{ + return BT_VERSION_EXTRA; +} -- 2.34.1