summaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorJussi Pakkanen <jussi.pakkanen@mailbox.org>2025-08-17 20:49:01 +0300
committerJussi Pakkanen <jussi.pakkanen@mailbox.org>2025-08-18 23:05:41 +0300
commita604bb34ed5aab514865588c1647775b2eeea2c0 (patch)
tree2a939a37c2555ae664bafba6035e79106dc3627b /mesonbuild
parenta3437c4c81a96b41576f810c51c9b0b5ce5631c2 (diff)
downloadmeson-a604bb34ed5aab514865588c1647775b2eeea2c0.tar.gz
Revert "backends: Use POSIX paths for target paths"
This reverts commit 12563f74a9f3dda70dcd4778aa958de355d1fae7.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/backends.py10
-rw-r--r--mesonbuild/backend/ninjabackend.py4
-rw-r--r--mesonbuild/mintro.py11
3 files changed, 12 insertions, 13 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index d4de240d4..8fe696e4a 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -150,7 +150,7 @@ class TargetInstallData:
def __post_init__(self, outdir_name: T.Optional[str]) -> None:
if outdir_name is None:
outdir_name = os.path.join('{prefix}', self.outdir)
- self.out_name = Path(outdir_name, os.path.basename(self.fname)).as_posix()
+ self.out_name = os.path.join(outdir_name, os.path.basename(self.fname))
@dataclass(eq=False)
class InstallEmptyDir:
@@ -306,16 +306,16 @@ class Backend:
else:
assert isinstance(t, build.BuildTarget), t
filename = t.get_filename()
- return Path(self.get_target_dir(t), filename).as_posix()
+ return os.path.join(self.get_target_dir(t), filename)
def get_target_filename_abs(self, target: T.Union[build.Target, build.CustomTargetIndex]) -> str:
- return Path(self.environment.get_build_dir(), self.get_target_filename(target)).as_posix()
+ return os.path.join(self.environment.get_build_dir(), self.get_target_filename(target))
def get_target_debug_filename(self, target: build.BuildTarget) -> T.Optional[str]:
assert isinstance(target, build.BuildTarget), target
if target.get_debug_filename():
debug_filename = target.get_debug_filename()
- return Path(self.get_target_dir(target), debug_filename).as_posix()
+ return os.path.join(self.get_target_dir(target), debug_filename)
else:
return None
@@ -323,7 +323,7 @@ class Backend:
assert isinstance(target, build.BuildTarget), target
if not target.get_debug_filename():
return None
- return Path(self.environment.get_build_dir(), self.get_target_debug_filename(target)).as_posix()
+ return os.path.join(self.environment.get_build_dir(), self.get_target_debug_filename(target))
def get_source_dir_include_args(self, target: build.BuildTarget, compiler: 'Compiler', *, absolute_path: bool = False) -> T.List[str]:
curdir = target.get_subdir()
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 76f16069e..d93e8c99c 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -3388,7 +3388,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
def get_target_shsym_filename(self, target):
# Always name the .symbols file after the primary build output because it always exists
targetdir = self.get_target_private_dir(target)
- return Path(targetdir, target.get_filename() + '.symbols').as_posix()
+ return os.path.join(targetdir, target.get_filename() + '.symbols')
def generate_shsym(self, target) -> None:
target_file = self.get_target_filename(target)
@@ -3407,7 +3407,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
self.add_build(elem)
def get_import_filename(self, target) -> str:
- return Path(self.get_target_dir(target), target.import_filename).as_posix()
+ return os.path.join(self.get_target_dir(target), target.import_filename)
def get_target_type_link_args(self, target, linker):
commands = []
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