diff options
| author | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-08-17 20:49:01 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jussi.pakkanen@mailbox.org> | 2025-08-18 23:05:41 +0300 |
| commit | a604bb34ed5aab514865588c1647775b2eeea2c0 (patch) | |
| tree | 2a939a37c2555ae664bafba6035e79106dc3627b /mesonbuild/mintro.py | |
| parent | a3437c4c81a96b41576f810c51c9b0b5ce5631c2 (diff) | |
| download | meson-a604bb34ed5aab514865588c1647775b2eeea2c0.tar.gz | |
Revert "backends: Use POSIX paths for target paths"
This reverts commit 12563f74a9f3dda70dcd4778aa958de355d1fae7.
Diffstat (limited to 'mesonbuild/mintro.py')
| -rw-r--r-- | mesonbuild/mintro.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index e19e528a3..9f7eb33ac 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -128,7 +128,7 @@ def list_installed(installdata: backends.InstallData) -> T.Dict[str, str]: def list_install_plan(installdata: backends.InstallData) -> T.Dict[str, T.Dict[str, T.Dict[str, T.Union[str, T.List[str], None]]]]: plan: T.Dict[str, T.Dict[str, T.Dict[str, T.Union[str, T.List[str], None]]]] = { 'targets': { - Path(installdata.build_dir, target.fname).as_posix(): { + os.path.join(installdata.build_dir, target.fname): { 'destination': target.out_name, 'tag': target.tag or None, 'subproject': target.subproject or None, @@ -146,14 +146,13 @@ def list_install_plan(installdata: backends.InstallData) -> T.Dict[str, T.Dict[s }.items(): # Mypy doesn't recognize SubdirInstallData as a subclass of InstallDataBase for data in data_list: # type: ignore[attr-defined] - data_path = Path(data.path).as_posix() data_type = data.data_type or key - install_path_name = Path(data.install_path_name) + install_path_name = data.install_path_name if key == 'headers': # in the headers, install_path_name is the directory - install_path_name = install_path_name / os.path.basename(data.path) + install_path_name = os.path.join(install_path_name, os.path.basename(data.path)) entry = { - 'destination': install_path_name.as_posix(), + 'destination': install_path_name, 'tag': data.tag or None, 'subproject': data.subproject or None, } @@ -164,7 +163,7 @@ def list_install_plan(installdata: backends.InstallData) -> T.Dict[str, T.Dict[s entry['exclude_files'] = list(exclude_files) plan[data_type] = plan.get(data_type, {}) - plan[data_type][data_path] = entry + plan[data_type][data.path] = entry return plan |