FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Regressions due to the changes in find_program

This commit is contained in:
Thomas Nagy 2014-09-28 21:16:54 +02:00
parent c35c7237d6
commit 8fc4aacb7f
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demos/wscript
View File

@ -15,10 +15,10 @@ if "uname" in dir(os): machine = os.uname()[1]
elif sys.platform == "win32": machine = os.environ["COMPUTERNAME"]
else: raise Exception("Unknown platform, cannot get machine name")
from waflib import Logs
from waflib import Logs, Errors
# python 2.3 tends to hang for whatever reason :-/
PYTHONS = "2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3".split()
PYTHONS = "2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3 3.4".split()
DIRS = ['c', 'python']
@ -82,8 +82,8 @@ def configure(conf):
try:
conf.find_program('python'+x, var=x)
# unpacking the waf directory concurrently can lead to a race condition, we'll need to take care of this (thanks, build farm!)
conf.cmd_and_log(conf.env[x] + " ./waf --version", env={})
except:
conf.cmd_and_log(conf.env[x] + ['./waf', '--version'], env={})
except Exception as e:
pass
else:
conf.env.append_value('PYTHONS', x)
@ -107,14 +107,14 @@ def installcheck(bld):
#print('testsuite: waflib')
def waf_cmd(self):
cmd = [self.env[self.generator.python], self.env.WAF, 'distclean', 'configure', 'build', 'clean', 'build', '-o', 'build' + self.generator.python]
cmd = self.env[self.generator.python] + [self.env.WAF, 'distclean', 'configure', 'build', 'clean', 'build', '-o', 'build' + self.generator.python]
cwd = self.generator.cwd
env = dict(os.environ)
env['WAFDIR'] = ''
env['WAFLOCK'] = '.lock-wscript' + self.generator.python # use a different build directory for each build
try:
bld.cmd_and_log(cmd, cwd=cwd, env=env, quiet=0, )
except:
except Errors.WafError as e:
e = sys.exc_info()[1]
s = "testsuite: %s\ntestsuite-xfail: %s [ %s \n %s ]\n" % (self.generator.name, self.generator.name, e.stderr, e.stdout)
Logs.info(s)