[Xfce4-commits] <midori:master> Fallback to folder name to guess release version

[Christian Dywan]

Updating branch refs/heads/master
         to d21263985bafef300a99e8d03e9698d80da0705e (commit)
       from aa6e7151f8d6359f926563f0365b96e847d7f4da (commit)

commit d21263985bafef300a99e8d03e9698d80da0705e
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Nov 19 01:55:22 2012 +0100

    Fallback to folder name to guess release version

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

diff --git a/wscript b/wscript
index 41b2b55..5bceed7 100644
--- a/wscript
+++ b/wscript
@@ -40,12 +40,16 @@ try:
         git = Utils.cmd_output (['git', 'describe'], silent=True)
         if git:
             VERSION_FULL = git.strip ()
-            VERSION_SUFFIX = VERSION_FULL.replace (VERSION, '')
     elif os.path.isdir ('.bzr'):
         bzr = Utils.cmd_output (['bzr', 'revno'], silent=True)
         if bzr:
             VERSION_FULL = '%s~r%s' % (VERSION, bzr.strip ())
-            VERSION_SUFFIX = VERSION_FULL.replace (VERSION, '')
+    else:
+        folder = os.getcwd ()
+        if VERSION in folder:
+            VERSION_FULL = os.path.basename (folder)
+    if VERSION in VERSION_FULL:
+        VERSION_SUFFIX = VERSION_FULL.replace (VERSION, '')
 except:
     pass