diff options
author | David Robillard <d@drobilla.net> | 2019-03-17 17:31:03 +0100 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2019-03-17 18:14:27 +0100 |
commit | f15dd76e1bf5dfbb2b46d302efeaf120d0ba69b0 (patch) | |
tree | 3ee0b1e31255c1a35ebe08e8885f755d2563ac9b /waflib/Scripting.py | |
parent | 6ce4b684f8c2e3077ec145191b9ab902e30bafae (diff) | |
parent | ceefc55f3175d6201fb09aa8114916b249a5828d (diff) | |
download | lilv-f15dd76e1bf5dfbb2b46d302efeaf120d0ba69b0.tar.gz lilv-f15dd76e1bf5dfbb2b46d302efeaf120d0ba69b0.tar.bz2 lilv-f15dd76e1bf5dfbb2b46d302efeaf120d0ba69b0.zip |
Update autowaf and adapt to new API
Diffstat (limited to 'waflib/Scripting.py')
-rw-r--r-- | waflib/Scripting.py | 10 |
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) |