ardour/livetrax
13
0
Fork 0
Code

improve itstool detection:

Browse Source 
handle "/bin/sh: 1: itstool: not found" cases.
This commit is contained in:
Robin Gareus 2015-12-05 14:04:11 +01:00
parent 7ad8ad8823
commit 68d3b45976
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wscript
View File

@ -752,11 +752,12 @@ def configure(conf):
if Options.options.freedesktop: if Options.options.freedesktop:
output = subprocess.Popen("itstool --version", shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() output = subprocess.Popen("itstool --version", shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
o = output[0].decode('utf-8') o = output[0].decode('utf-8')
itstool = o.split(' ')[0]
version = o.split(' ')[1].split('.') version = o.split(' ')[1].split('.')
# use distutils.version.StrictVersion or something python to check >= 1.0.4 # use distutils.version.StrictVersion or something python to check >= 1.0.4
# but first make sure that all build-hosts (incl. OSX-10.5/PPC) have that python lib. # but first make sure that all build-hosts (incl. OSX-10.5/PPC) have that python lib.
# lazy approach: just use major version 2.X.X # lazy approach: just use major version 2.X.X
if version[0] < "2": if itstool != "itstool" or version[0] < "2":
print("--freedesktop requires itstool > 2.0.0 to translate files.") print("--freedesktop requires itstool > 2.0.0 to translate files.")
sys.exit(-1) sys.exit(-1)