[lttng-tools PATCH] version control

[lttng-tools PATCH] version control

[Raphaël Beamonte]

Hello folks,

Like Alexandre explained, using different version control disallow the
use of the git describe command that gives us the git commit id to know
our running version of LTTng-tools. This patch aims to keep a version
number, even if it's not the most updated, even if we're outside a
git or bzr repository.

By default, it will just use the principal VERSION define. This behavior
was already in the source code, but wasn't working due to the default
blank GIT_VERSION define. Removing it does the trick.

Raphaël


Raphaël Beamonte (1):
  Fix: remove the default GIT_VERSION define to allow different version
    control

 include/version.h.tmpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

-- 
2.0.0.rc2


_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

[lttng-tools PATCH] Fix: remove the default GIT_VERSION define to allow different version control

[Raphaël Beamonte]

Signed-off-by: Raphaël Beamonte <raphael.beamonte@gmail.com>
---
 include/version.h.tmpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/version.h.tmpl b/include/version.h.tmpl
index 639e6d7..2cab733 100644
--- a/include/version.h.tmpl
+++ b/include/version.h.tmpl
@@ -20,15 +20,13 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define GIT_VERSION
-
 /*
  * Define the macro containing the FULL version
  */
 #ifdef GIT_VERSION
 #define FULL_VERSION "" GIT_VERSION
 #else /* GIT_VERSION */
-#define FULL_VERSION "v" VERSION
+#define FULL_VERSION "" VERSION
 #endif /* GIT_VERSION */
 
 #endif /* VERSION_H */
-- 
2.0.0.rc2


_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Re: [lttng-tools PATCH] version control

[David Goulet]

[-- Attachment #1.1: Type: text/plain, Size: 1034 bytes --]

Merged!

On 03 Jun (14:30:08), Raphaël Beamonte wrote:
> Hello folks,
> 
> Like Alexandre explained, using different version control disallow the
> use of the git describe command that gives us the git commit id to know
> our running version of LTTng-tools. This patch aims to keep a version
> number, even if it's not the most updated, even if we're outside a
> git or bzr repository.
> 
> By default, it will just use the principal VERSION define. This behavior
> was already in the source code, but wasn't working due to the default
> blank GIT_VERSION define. Removing it does the trick.
> 
> Raphaël
> 
> 
> Raphaël Beamonte (1):
>   Fix: remove the default GIT_VERSION define to allow different version
>     control
> 
>  include/version.h.tmpl | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> -- 
> 2.0.0.rc2
> 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev@lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 603 bytes --]

[-- Attachment #2: Type: text/plain, Size: 155 bytes --]

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev