From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 20 Feb 2012 20:00:36 +0000 (-0500)
Subject: Standardize version across toolchain
X-Git-Tag: v2.0.0-rc1~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2694975d1855ecc24d2178c9be20a5ba958540a3;p=lttng-ust.git

Standardize version across toolchain

closes #80

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/configure.ac b/configure.ac
index 7a3cb9eb..693cb185 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[1.9.8],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.0.0-rc1],[mathieu dot desnoyers 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
@@ -24,9 +24,9 @@ AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h])
 
 # Compute minor/major/patchlevel version numbers
 AC_PROG_SED
-major_version=$(echo AC_PACKAGE_VERSION | sed 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*$/\1/')
-minor_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*$/\1/')
-patchlevel_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)$/\1/')
+major_version=$(echo AC_PACKAGE_VERSION | sed 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*.*$/\1/')
+minor_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*.*$/\1/')
+patchlevel_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\).*$/\1/')
 AC_SUBST([MAJOR_VERSION], [$major_version])
 AC_SUBST([MINOR_VERSION], [$minor_version])
 AC_SUBST([PATCHLEVEL_VERSION], [$patchlevel_version])
diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index c4b67c6b..b6d4f9b5 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -1134,8 +1134,8 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 		lttng_alignof(uint16_t) * CHAR_BIT,
 		lttng_alignof(uint32_t) * CHAR_BIT,
 		lttng_alignof(uint64_t) * CHAR_BIT,
-		CTF_VERSION_MAJOR,
-		CTF_VERSION_MINOR,
+		CTF_SPEC_MAJOR,
+		CTF_SPEC_MINOR,
 		uuid_s,
 #if (BYTE_ORDER == BIG_ENDIAN)
 		"be"
@@ -1153,11 +1153,17 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
 		"env {\n"
 		"	vpid = %d;\n"
 		"	procname = \"%s\";\n"
-		"	domain = %s;\n"
+		"	domain = \"ust\";\n"
+		"	tracer_name = \"lttng-ust\";\n"
+		"	tracer_major = %u;\n"
+		"	tracer_minor = %u;\n"
+		"	tracer_patchlevel = %u;\n"
 		"};\n\n",
 		(int) getpid(),
 		procname,
-		"ust"
+		LTTNG_UST_MAJOR_VERSION,
+		LTTNG_UST_MINOR_VERSION,
+		LTTNG_UST_PATCHLEVEL_VERSION
 		);
 	if (ret)
 		goto end;
diff --git a/liblttng-ust/ltt-tracer.h b/liblttng-ust/ltt-tracer.h
index fb54e9cd..e3593b18 100644
--- a/liblttng-ust/ltt-tracer.h
+++ b/liblttng-ust/ltt-tracer.h
@@ -41,10 +41,6 @@
 #define CTF_SPEC_MAJOR			1
 #define CTF_SPEC_MINOR			8
 
-/* Tracer major/minor versions */
-#define CTF_VERSION_MAJOR		0
-#define CTF_VERSION_MINOR		1
-
 /*
  * Number of milliseconds to retry before failing metadata writes on buffer full
  * condition. (10 seconds)