diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-03-23 01:59:29 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-03-23 01:59:29 +0000 |
| commit | 7615533e25b9d8d613535ca593fb864762d8a5fe (patch) | |
| tree | 913f220ba1e88aeb7304a9c89d6ce32d418ce90e /wscript | |
| parent | fe50be9c37b0c93ac87075018488a9716432d8de (diff) | |
We are using lightweight (not annotated) tags so we need an extra option to git describe.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -29,7 +29,7 @@ from waflib import Logs, Context APPNAME = 'dcpomatic' 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 --abbrev=0'), 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() @@ -41,7 +41,7 @@ print('Version: %s' % VERSION) def options(opt): opt.load('compiler_cxx') opt.load('winres') - + opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') |
