diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2021-12-05 02:04:07 -0500 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-12-05 11:39:20 -0500 |
commit | 5b7d4f8bd30d8f5ed4aabbecee0c63e46d1da504 (patch) | |
tree | 56055cd83a9ebedd8e7e66fba151c29b64a3b018 /mesonbuild/scripts | |
parent | 4b2c54569df780e36fc5bf1905ae6b60d1393fba (diff) | |
download | meson-5b7d4f8bd30d8f5ed4aabbecee0c63e46d1da504.zip meson-5b7d4f8bd30d8f5ed4aabbecee0c63e46d1da504.tar.gz meson-5b7d4f8bd30d8f5ed4aabbecee0c63e46d1da504.tar.bz2 |
rename exe_runner to exe_wrapper everywhere
I don't understand the purpose of this confusing API naming split.
Diffstat (limited to 'mesonbuild/scripts')
-rw-r--r-- | mesonbuild/scripts/meson_exe.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py index dc89876..486c101 100644 --- a/mesonbuild/scripts/meson_exe.py +++ b/mesonbuild/scripts/meson_exe.py @@ -33,11 +33,11 @@ def buildparser() -> argparse.ArgumentParser: return parser def run_exe(exe: ExecutableSerialisation, extra_env: T.Optional[T.Dict[str, str]] = None) -> int: - if exe.exe_runner: - if not exe.exe_runner.found(): + if exe.exe_wrapper: + if not exe.exe_wrapper.found(): raise AssertionError('BUG: Can\'t run cross-compiled exe {!r} with not-found ' - 'wrapper {!r}'.format(exe.cmd_args[0], exe.exe_runner.get_path())) - cmd_args = exe.exe_runner.get_command() + exe.cmd_args + 'wrapper {!r}'.format(exe.cmd_args[0], exe.exe_wrapper.get_path())) + cmd_args = exe.exe_wrapper.get_command() + exe.cmd_args else: cmd_args = exe.cmd_args child_env = os.environ.copy() @@ -48,9 +48,9 @@ def run_exe(exe: ExecutableSerialisation, extra_env: T.Optional[T.Dict[str, str] if exe.extra_paths: child_env['PATH'] = (os.pathsep.join(exe.extra_paths + ['']) + child_env['PATH']) - if exe.exe_runner and mesonlib.substring_is_in_list('wine', exe.exe_runner.get_command()): + if exe.exe_wrapper and mesonlib.substring_is_in_list('wine', exe.exe_wrapper.get_command()): child_env['WINEPATH'] = mesonlib.get_wine_shortpath( - exe.exe_runner.get_command(), + exe.exe_wrapper.get_command(), ['Z:' + p for p in exe.extra_paths] + child_env.get('WINEPATH', '').split(';') ) |