From 0e4cbe7e2c4c6a8343e710a3b050af8c33f95e21 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Tue, 20 Mar 2012 18:32:45 -0400 Subject: [PATCH] Update version to 2.0.0 stable ROCK ON!!! Signed-off-by: David Goulet --- ChangeLog | 4 ++++ configure.ac | 14 +++++++++++--- src/bin/lttng/commands/version.c | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22d3d4c9a..a459d3fd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-03-20 lttng-tools 2.0.0 + * Fist STABLE version + * Add version name: Annedd'ale + 2012-03-20 lttng-tools 2.0.0-rc4 * Fix: add small detail to enable-channel man page * Fix: warned of arbitrary time for ust-nprocesses test diff --git a/configure.ac b/configure.ac index 6f1902245..5808c7914 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lttng-tools],[2.0.0-rc4],[dgoulet@efficios.com],[],[http://lttng.org]) +AC_INIT([lttng-tools],[2.0.0],[dgoulet@efficios.com],[],[http://lttng.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -6,8 +6,11 @@ AC_CONFIG_MACRO_DIR([config]) AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_DEFINE_UNQUOTED([VERSION_NAME], "TBD", "") -AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], "TBD", "") +version_name="Annedd'ale" +version_description="New type of beer, 100% from Quebec, flavored with sapin beaumier needles, with a touch of hops." + +AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "") +AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], "") AC_CONFIG_HEADERS([include/config.h]) @@ -202,6 +205,11 @@ AC_OUTPUT # AS_ECHO() +AS_ECHO("Version name: $version_name") +AS_ECHO("$version_description") + +AS_ECHO() + # Target architecture we're building for target_arch=$host_cpu [ diff --git a/src/bin/lttng/commands/version.c b/src/bin/lttng/commands/version.c index 0ab31b637..a6bbd6aec 100644 --- a/src/bin/lttng/commands/version.c +++ b/src/bin/lttng/commands/version.c @@ -77,9 +77,9 @@ int cmd_version(int argc, const char **argv) } } - MSG("lttng version " VERSION); + MSG("lttng version " VERSION " - " VERSION_NAME); MSG("Web site: http://lttng.org/"); - MSG("\nlttng is free software and under the GPL license."); + MSG("\nlttng is free software and under the GPL license and part LGPL"); end: poptFreeContext(pc); -- 2.34.1