From: Carl Hetherington Date: Thu, 27 Sep 2018 21:16:27 +0000 (+0100) Subject: Fix tarball versioning. X-Git-Tag: v0.1.5 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=cae5d667713322614a9652600b6fbbdbd06a3367;p=asdcplib-cth.git Fix tarball versioning. --- diff --git a/wscript b/wscript index 2e0209a..ff44e84 100644 --- a/wscript +++ b/wscript @@ -7,13 +7,15 @@ from waflib import Logs APPNAME = 'libasdcp-cth' -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 --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] - -if this_version == '': - VERSION = '%sdevel' % last_version[1:].strip() +if os.path.exists('.git'): + 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 --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] + if this_version == '': + VERSION = '%sdevel' % last_version[1:].strip() + else: + VERSION = this_version[1:].strip() else: - VERSION = this_version[1:].strip() + VERSION = open('VERSION').read().strip() def options(opt): opt.load('compiler_cxx') @@ -101,3 +103,8 @@ def post(ctx): def tags(bld): os.system('etags src/*.cc src/*.h') + +def dist(bld): + f = open('VERSION', 'w') + print>>f,VERSION + f.close()