Skip to contentSkip to conversation

version control

PATCH New Raphaël Beamonte 2 participants 3 messages Jun 3, 2014 – Jun 12, 2014 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 version control

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(-)
Signature · 7 lines
2.0.0.rc2


_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

PATCH 1/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(-)
include/version.h.tmpl +1 -3
index 639e6d7..2cab733 100644
@@ -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 */
Signature · 7 lines
2.0.0.rc2


_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
#4 lore raw
In reply to a message not in the archive

Merged!

Quoted 15 lines · 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

Quoted 15 lines

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(-)
Signature · 7 lines
2.0.0.rc2


_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev