diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-06-03 10:34:55 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-06-17 11:53:38 -0400 |
| commit | 57909b53d6d2099e45873688b659ce071f6039ef (patch) | |
| tree | e97b29cad444268cdef507abf83205bff3367ef7 /mesonbuild/scripts | |
| parent | b1649899a2d392bd0a4c3a629614d29aafd73bb9 (diff) | |
| download | meson-57909b53d6d2099e45873688b659ce071f6039ef.zip meson-57909b53d6d2099e45873688b659ce071f6039ef.tar.gz meson-57909b53d6d2099e45873688b659ce071f6039ef.tar.bz2 | |
Improve WINEPATH reduction
- Remove duplicated code in mdevenv.py
- Change the limit to 1024 instead of 2048 which is what has been
tested.
- Skip shortening if it is already short enough.
- Skip shortening with wine >= 6.4 which does not seems to have that
limitation any more.
- Downgrade exception to warning in the case WINEPATH cannot be
shortened under 1024 chars, it is possible that it will still work.
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/meson_exe.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py index 486c101..c8f2f3b 100644 --- a/mesonbuild/scripts/meson_exe.py +++ b/mesonbuild/scripts/meson_exe.py @@ -51,7 +51,8 @@ def run_exe(exe: ExecutableSerialisation, extra_env: T.Optional[T.Dict[str, str] 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_wrapper.get_command(), - ['Z:' + p for p in exe.extra_paths] + child_env.get('WINEPATH', '').split(';') + ['Z:' + p for p in exe.extra_paths] + child_env.get('WINEPATH', '').split(';'), + exe.workdir ) stdin = None |