Update version to 2.0.0 stable

ROCK ON!!!

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/ChangeLog b/ChangeLog
index 22d3d4c9aad600d3820b13e99a503ccb8bbbe8ea..a459d3fd82c4e602b74cdee1ae69c3722fc275d7 100644 (file)
--- 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
 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 6f1902245201ce9c25f93143ae232975129051fb..5808c7914a250d66f80af8e9dcd5d8cfeb624d2e 100644 (file)
--- 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
 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])])
 
 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])
 
 
 AC_CONFIG_HEADERS([include/config.h])
 


@@ -202,6 +205,11 @@ AC_OUTPUT
 #
 AS_ECHO()
 
 #
 AS_ECHO()
 

+AS_ECHO("Version name: $version_name")
+AS_ECHO("$version_description")
+
+AS_ECHO()
+

 # Target architecture we're building for
 target_arch=$host_cpu
 [
 # 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 0ab31b637bef4ee85836247a14dcee7a20ddc12d..a6bbd6aece3c7a9e674705ddda560dd4bcd0e39b 100644 (file)
--- 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("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);
 
 end:
        poptFreeContext(pc);