aboutsummaryrefslogtreecommitdiffstats
path: root/waflib/Scripting.py
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-17 17:31:03 +0100
committerDavid Robillard <d@drobilla.net>2019-03-17 18:14:27 +0100
commitada3add535204d69b5f29a41fe03ed71330d4cfd (patch)
tree7baaf187de01c826dea239094c2d9d4007e6459e /waflib/Scripting.py
parent72741e7bc14a1b3286d2b545426387e874c10c68 (diff)
parent69deb1ab7f622d04e9f1ef132cf3577abf9053a0 (diff)
downloadjalv-ada3add535204d69b5f29a41fe03ed71330d4cfd.tar.gz
jalv-ada3add535204d69b5f29a41fe03ed71330d4cfd.tar.bz2
jalv-ada3add535204d69b5f29a41fe03ed71330d4cfd.zip
Update autowaf and adapt to new API
Diffstat (limited to 'waflib/Scripting.py')
-rw-r--r--waflib/Scripting.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/waflib/Scripting.py b/waflib/Scripting.py
index 749d4f2..ae17a8b 100644
--- a/waflib/Scripting.py
+++ b/waflib/Scripting.py
@@ -216,7 +216,10 @@ def parse_options():
ctx = Context.create_context('options')
ctx.execute()
if not Options.commands:
- Options.commands.append(default_cmd)
+ if isinstance(default_cmd, list):
+ Options.commands.extend(default_cmd)
+ else:
+ Options.commands.append(default_cmd)
if Options.options.whelp:
ctx.parser.print_help()
sys.exit(0)
@@ -280,7 +283,7 @@ def distclean_dir(dirname):
pass
try:
- shutil.rmtree('c4che')
+ shutil.rmtree(Build.CACHE_DIR)
except OSError:
pass
@@ -598,12 +601,15 @@ def autoconfigure(execute_method):
cmd = env.config_cmd or 'configure'
if Configure.autoconfig == 'clobber':
tmp = Options.options.__dict__
+ launch_dir_tmp = Context.launch_dir
if env.options:
Options.options.__dict__ = env.options
+ Context.launch_dir = env.launch_dir
try:
run_command(cmd)
finally:
Options.options.__dict__ = tmp
+ Context.launch_dir = launch_dir_tmp
else:
run_command(cmd)
run_command(self.cmd)