diff options
author | David Robillard <d@drobilla.net> | 2019-03-17 17:23:45 +0100 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2019-03-17 17:24:02 +0100 |
commit | e7a29b6b9b2f842314244c23c14d8f8f560904e1 (patch) | |
tree | d2dcbaf61f3749f73dc7a5e10d3fc6cd5e6e129a /Scripting.py | |
parent | 8280f9de69f93624896b8875caf039066cac0314 (diff) | |
download | autowaf-e7a29b6b9b2f842314244c23c14d8f8f560904e1.tar.gz autowaf-e7a29b6b9b2f842314244c23c14d8f8f560904e1.tar.bz2 autowaf-e7a29b6b9b2f842314244c23c14d8f8f560904e1.zip |
Upgrade to waf 2.0.15
Diffstat (limited to 'Scripting.py')
-rw-r--r-- | Scripting.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Scripting.py b/Scripting.py index 749d4f2..ae17a8b 100644 --- a/Scripting.py +++ b/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) |