diff options
Diffstat (limited to 'mesonbuild/mdevenv.py')
| -rw-r--r-- | mesonbuild/mdevenv.py | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/mesonbuild/mdevenv.py b/mesonbuild/mdevenv.py index 46b301c..d0e84ff 100644 --- a/mesonbuild/mdevenv.py +++ b/mesonbuild/mdevenv.py @@ -6,7 +6,7 @@ import itertools from pathlib import Path from . import build, minstall, dependencies -from .mesonlib import MesonException, RealPathAction, is_windows, setup_vsenv, OptionKey, quote_arg +from .mesonlib import MesonException, RealPathAction, is_windows, setup_vsenv, OptionKey, quote_arg, get_wine_shortpath from . import mlog import typing as T @@ -28,43 +28,6 @@ def get_windows_shell() -> str: result = subprocess.check_output(command) return result.decode().strip() -def get_wine_shortpath(build_dir: str, winecmd: str, wine_paths: T.List[str]) -> T.List[str]: - ''' - WINEPATH size is limited to 1024 bytes which can easily be exceeded when - adding the path to every dll inside build directory. See - https://bugs.winehq.org/show_bug.cgi?id=45810. - - To shorthen it as much as possible we use path relative to builddir - where possible and convert absolute paths to Windows shortpath (e.g. - "/usr/x86_64-w64-mingw32/lib" to "Z:\\usr\\X86_~FWL\\lib"). - ''' - rel_paths = [] - abs_paths = [] - builddir = Path(build_dir) - for p in wine_paths: - try: - rel = Path(p).relative_to(builddir) - rel_paths.append(str(rel)) - except ValueError: - abs_paths.append(p) - if not abs_paths: - return rel_paths - with tempfile.NamedTemporaryFile('w', suffix='.bat', encoding='utf-8', delete=False) as bat_file: - bat_file.write(''' - @ECHO OFF - for %%x in (%*) do ( - echo|set /p=;%~sx - ) - ''') - try: - stdout = subprocess.check_output([winecmd, 'cmd', '/C', bat_file.name] + abs_paths, - encoding='utf-8', stderr=subprocess.DEVNULL) - return rel_paths + [p for p in set(stdout.split(';')) if p] - except subprocess.CalledProcessError: - return rel_paths + abs_paths - finally: - os.unlink(bat_file.name) - def reduce_winepath(build_dir: str, env: T.Dict[str, str]) -> None: winepath = env.get('WINEPATH') if not winepath: @@ -72,10 +35,7 @@ def reduce_winepath(build_dir: str, env: T.Dict[str, str]) -> None: winecmd = shutil.which('wine64') or shutil.which('wine') if not winecmd: return - winepath = ';'.join(get_wine_shortpath(build_dir, winecmd, winepath.split(';'))) - if len(winepath) > 1024: - mlog.warning(f'WINEPATH exceeds 1024 characters which could cause issues:\n{winepath}') - env['WINEPATH'] = winepath + env['WINEPATH'] = get_wine_shortpath([winecmd], winepath.split(';'), build_dir) mlog.log('Meson detected wine and has set WINEPATH accordingly') def get_env(b: build.Build, build_dir: str) -> T.Tuple[T.Dict[str, str], T.Set[str]]: |