[Xfce4-commits] <midori:master> Use 'git describe' to generate the git version string

[Christian Dywan]

Updating branch refs/heads/master
         to b5a4023a7d40184cd270d43fe5b59191b87e87b5 (commit)
       from 1b933a5da6049407afdf655f9810f56cf0649478 (commit)

commit b5a4023a7d40184cd270d43fe5b59191b87e87b5
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Jul 14 23:48:45 2010 +0200

    Use 'git describe' to generate the git version string

 wscript |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wscript b/wscript
index c21dc80..ae358ab 100644
--- a/wscript
+++ b/wscript
@@ -35,9 +35,9 @@ APPNAME = 'midori'
 VERSION = str (major) + '.' + str (minor) + '.' + str (micro)
 
 try:
-    git = Utils.cmd_output (['git', 'rev-parse', '--short', 'HEAD'], silent=True)
+    git = Utils.cmd_output (['git', 'describe'], silent=True)
     if git:
-        VERSION = (VERSION + '-' + git).strip ()
+        VERSION = git
 except:
     pass