diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-07 16:26:34 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-07 16:27:16 +0400 |
| commit | 43b5f0af2dd855f35b5e359dc730c58a953d641d (patch) | |
| tree | daf58d1f30d9f8aeeb2d76a4a306d2c3f2d97131 /build_files/scons | |
| parent | c05896eb35e61918ccbfc8deaf7312895fcade36 (diff) | |
tweaks to buildinfo
We wouldn't really have release branches, building will happen
from annotated tags.
Made it so building tag revision equals to a master branch.
Diffstat (limited to 'build_files/scons')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index fc4121a5934..4ceadc7b0a4 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -430,6 +430,11 @@ def buildinfo(lenv, build_type): master_check = os.popen('git branch --list master --contains ' + build_hash).read().strip() if master_check == 'master': build_branch = 'master' + else: + head_hash = os.popen('git rev-parse HEAD').read().strip() + tag_hashes = os.popen('git show-ref --tags -d').read() + if tag_hashes.find(head_hash) != -1: + build_branch = 'master' if build_hash == '': build_hash = os.popen('git rev-parse --short HEAD').read().strip() |