From 191e92a4babdea589aa9c78fa659b0d8fc97ff82 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 27 Apr 2024 17:41:52 +0200 Subject: Use plain git hash for VERSION when there is no exact tag. --- wscript | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wscript b/wscript index 3cc5c2f27..d97a2f97c 100644 --- a/wscript +++ b/wscript @@ -38,17 +38,17 @@ APPNAME = 'dcpomatic' libdcp_version = '1.8.73' libsub_version = '1.6.42' -this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] -last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] +this_version = subprocess.Popen(['git', 'tag', '-l', '--points-at', 'HEAD'], stdout=subprocess.PIPE).communicate()[0] +git_head = subprocess.Popen(['git', 'rev-parse', '--short=9', 'HEAD'], stdout=subprocess.PIPE).communicate()[0] # Python 2/3 compatibility; I don't really understand what's going on here if not isinstance(this_version, str): this_version = this_version.decode('utf-8') -if not isinstance(last_version, str): - last_version = last_version.decode('utf-8') +if not isinstance(git_head, str): + git_head = git_head.decode('utf-8') -if this_version == '' or this_version == 'merged-to-main': - VERSION = '%sdevel' % last_version[1:].strip() +if this_version == '': + VERSION = git_head.strip() else: VERSION = this_version[1:].strip() -- cgit v1.2.3