Updating branch refs/heads/master to 83f8d73061740b1d96d3f5b5c6f3beb546524f12 (commit) from e6d4805240da6e378d1b26d357c4050af74114be (commit)
commit 83f8d73061740b1d96d3f5b5c6f3beb546524f12 Author: Christian Dywan <christ...@twotoasts.de> Date: Sun Nov 18 21:58:37 2012 +0100 Recognize bzr relese version and print during configuration wscript | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/wscript b/wscript index 7466616..41b2b55 100644 --- a/wscript +++ b/wscript @@ -41,6 +41,11 @@ try: 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, '') except: pass @@ -103,6 +108,8 @@ def configure (conf): int(given_major) == major and int(given_minor) > minor or \ int(given_major) == major and int(given_minor) == minor and int(given_micro) >= micro + conf.check_message_custom ('release version', '', VERSION_FULL) + conf.check_tool ('compiler_cc') conf.check_tool ('vala') conf.check_tool ('glib2') _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits