pathlib: Fix resolve() by overriding it in Python 3.5

6 files changed, 7 insertions, 6 deletions

diff --git a/mesonbuild/cmake/client.py b/mesonbuild/cmake/client.py
index 8057c3b..ce79e8e 100644
--- a/mesonbuild/cmake/client.py
+++ b/mesonbuild/cmake/client.py
@@ -21,7 +21,7 @@ from ..mesonlib import MachineChoice
 from .. import mlog
 from contextlib import contextmanager
 from subprocess import Popen, PIPE, TimeoutExpired
-from pathlib import Path
+from .._pathlib import Path
 import typing as T
 import json
 
diff --git a/mesonbuild/cmake/common.py b/mesonbuild/cmake/common.py
index bb0c4ae..21460ca 100644
--- a/mesonbuild/cmake/common.py
+++ b/mesonbuild/cmake/common.py
@@ -17,7 +17,7 @@
 
 from ..mesonlib import MesonException
 from .. import mlog
-from pathlib import Path
+from .._pathlib import Path
 import typing as T
 
 class CMakeException(MesonException):
diff --git a/mesonbuild/cmake/executor.py b/mesonbuild/cmake/executor.py
index bf89822..0413b56 100644
--- a/mesonbuild/cmake/executor.py
+++ b/mesonbuild/cmake/executor.py
@@ -16,7 +16,7 @@
 # or an interpreter-based tool.
 
 import subprocess as S
-from pathlib import Path
+from .._pathlib import Path
 from threading import Thread
 import typing as T
 import re
diff --git a/mesonbuild/cmake/fileapi.py b/mesonbuild/cmake/fileapi.py
index 4ef0caf..1b6c30d 100644
--- a/mesonbuild/cmake/fileapi.py
+++ b/mesonbuild/cmake/fileapi.py
@@ -15,7 +15,7 @@
 from .common import CMakeException, CMakeBuildFile, CMakeConfiguration
 import typing as T
 from .. import mlog
-from pathlib import Path
+from .._pathlib import Path
 import json
 import re
 
@@ -74,6 +74,7 @@ class CMakeFileAPI:
 
         # Debug output
         debug_json = self.build_dir / '..' / 'fileAPI.json'
+        debug_json = debug_json.resolve()
         debug_json.write_text(json.dumps(index, indent=2))
         mlog.cmd_ci_include(debug_json.as_posix())
 
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py
index aa43ae4..cad4509 100644
--- a/mesonbuild/cmake/interpreter.py
+++ b/mesonbuild/cmake/interpreter.py
@@ -26,7 +26,7 @@ from ..mesondata import mesondata
 from ..compilers.compilers import lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header
 from enum import Enum
 from functools import lru_cache
-from pathlib import Path
+from .._pathlib import Path
 import typing as T
 import re
 from os import environ
diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py
index bee011c..518db4f 100644
--- a/mesonbuild/cmake/traceparser.py
+++ b/mesonbuild/cmake/traceparser.py
@@ -21,7 +21,7 @@ from .. import mlog
 from ..mesonlib import version_compare
 
 import typing as T
-from pathlib import Path
+from .._pathlib import Path
 import re
 import json
 import textwrap