diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-17 20:01:13 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-03 17:02:35 +0100 |
| commit | bc9484b80080b4e77ed813bfd340f59ba1e10335 (patch) | |
| tree | ff6e18e20eef616272a1d302adb749d4b4c96589 | |
| parent | 6c951dde6bef50136b3b2a2814be40eed509fe7f (diff) | |
Re-fix python3 wscript problem.
| -rw-r--r-- | src/wscript | 4 | ||||
| -rw-r--r-- | wscript | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/wscript b/src/wscript index 08c9bd7..638a89d 100644 --- a/src/wscript +++ b/src/wscript @@ -3,9 +3,7 @@ def configure(conf): # Don't include the micro version number in PACKAGE_VERSION, as # this ends up in MXFs and screws up DCP-o-matic's test references # every time it changes - print(conf.env.VERSION) - s = conf.env.VERSION.split(b'.') - print(s) + s = conf.env.VERSION.split('.') major_minor = '%s.%s.0' % (s[0], s[1]) conf.env.append_value('CXXFLAGS', '-DPACKAGE_VERSION="%s"' % major_minor) if conf.options.target_windows: @@ -8,8 +8,8 @@ from waflib import Logs APPNAME = 'libasdcp-cth' 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] + this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0].decode('UTF-8') + last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0].decode('UTF-8') if this_version == '': VERSION = '%sdevel' % last_version[1:].strip() else: |