Build: make update support for git tags
Previously it only picked the appropriate version with the blender-vX.XX-release branches.
This commit is contained in:
parent
2be7a11e43
commit
5ecefc6a07
|
@ -40,7 +40,8 @@ if make_utils.command_missing(git_command):
|
||||||
|
|
||||||
# Test if we are building a specific release version.
|
# Test if we are building a specific release version.
|
||||||
branch = make_utils.git_branch(git_command)
|
branch = make_utils.git_branch(git_command)
|
||||||
release_version = make_utils.git_branch_release_version(branch)
|
tag = make_utils.git_tag(git_command)
|
||||||
|
release_version = make_utils.git_branch_release_version(branch, tag)
|
||||||
lib_tests_dirpath = os.path.join('..', 'lib', "tests")
|
lib_tests_dirpath = os.path.join('..', 'lib', "tests")
|
||||||
|
|
||||||
if not os.path.exists(lib_tests_dirpath):
|
if not os.path.exists(lib_tests_dirpath):
|
||||||
|
|
|
@ -197,7 +197,8 @@ if __name__ == "__main__":
|
||||||
|
|
||||||
# Test if we are building a specific release version.
|
# Test if we are building a specific release version.
|
||||||
branch = make_utils.git_branch(args.git_command)
|
branch = make_utils.git_branch(args.git_command)
|
||||||
release_version = make_utils.git_branch_release_version(branch)
|
tag = make_utils.git_tag(args.git_command)
|
||||||
|
release_version = make_utils.git_branch_release_version(branch, tag)
|
||||||
|
|
||||||
if not args.no_libraries:
|
if not args.no_libraries:
|
||||||
svn_update(args, release_version)
|
svn_update(args, release_version)
|
||||||
|
|
|
@ -36,7 +36,7 @@ def check_output(cmd, exit_on_error=True):
|
||||||
return output.strip()
|
return output.strip()
|
||||||
|
|
||||||
def git_branch(git_command):
|
def git_branch(git_command):
|
||||||
# Test if we are building a specific release version.
|
# Get current branch name.
|
||||||
try:
|
try:
|
||||||
branch = subprocess.check_output([git_command, "rev-parse", "--abbrev-ref", "HEAD"])
|
branch = subprocess.check_output([git_command, "rev-parse", "--abbrev-ref", "HEAD"])
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
|
@ -45,10 +45,23 @@ def git_branch(git_command):
|
||||||
|
|
||||||
return branch.strip().decode('utf8')
|
return branch.strip().decode('utf8')
|
||||||
|
|
||||||
def git_branch_release_version(branch):
|
def git_tag(git_command):
|
||||||
|
# Get current tag name.
|
||||||
|
try:
|
||||||
|
tag = subprocess.check_output([git_command, "describe", "--exact-match"])
|
||||||
|
except subprocess.CalledProcessError as e:
|
||||||
|
return None
|
||||||
|
|
||||||
|
return tag.strip().decode('utf8')
|
||||||
|
|
||||||
|
def git_branch_release_version(branch, tag):
|
||||||
release_version = re.search("^blender-v(.*)-release$", branch)
|
release_version = re.search("^blender-v(.*)-release$", branch)
|
||||||
if release_version:
|
if release_version:
|
||||||
release_version = release_version.group(1)
|
release_version = release_version.group(1)
|
||||||
|
elif tag:
|
||||||
|
release_version = re.search("^v([0-9]*\.[0-9]*).*", tag)
|
||||||
|
if release_version:
|
||||||
|
release_version = release_version.group(1)
|
||||||
return release_version
|
return release_version
|
||||||
|
|
||||||
def svn_libraries_base_url(release_version):
|
def svn_libraries_base_url(release_version):
|
||||||
|
|
Loading…
Reference in New Issue