Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compilation error with scons when building from detached head

Browse Source
This commit is contained in:
Sergey Sharybin
2014-07-10 16:23:48 +06:00
parent a1aa96940c
commit 42615d88b6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build_files/scons/tools/Blender.py Normal file → Executable file
View File

@@ -428,7 +428,8 @@ def buildinfo(lenv, build_type):
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}']).strip() build_hash = btools.get_command_output(['git', 'rev-parse', '--short', '@{u}']).strip()
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
# assume branch has no upstream configured # assume branch has no upstream configured
build_hash = '' build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
no_upstream = True
build_branch = btools.get_command_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip() build_branch = btools.get_command_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip()
@@ -442,10 +443,7 @@ def buildinfo(lenv, build_type):
if tag_hashes.find(head_hash) != -1: if tag_hashes.find(head_hash) != -1:
build_branch = 'master' build_branch = 'master'
if build_hash == '': if not no_upstream:
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()
no_upstream = True
else:
older_commits = btools.get_command_output(['git', 'log', '--oneline', 'HEAD..@{u}']).strip() older_commits = btools.get_command_output(['git', 'log', '--oneline', 'HEAD..@{u}']).strip()
if older_commits: if older_commits:
build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip() build_hash = btools.get_command_output(['git', 'rev-parse', '--short', 'HEAD']).strip()