os.path.relpath() can fail on Windows

If builddir and sourcedir have different drive letters, a relative path
doesn't exist, and os.path.relpath fails with a ValueError exception.

This just fixes the places which are hit by test cases in a simple-minded
way.  There are several other uses of os.path.relpath(), which might be
suspect.

3 files changed, 15 insertions, 13 deletions

diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 40ba213..28ef670 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -132,8 +132,8 @@ class Backend:
         self.build = build
         self.environment = build.environment
         self.processed_targets = {}
-        self.build_to_src = os.path.relpath(self.environment.get_source_dir(),
-                                            self.environment.get_build_dir())
+        self.build_to_src = mesonlib.relpath(self.environment.get_source_dir(),
+                                             self.environment.get_build_dir())
 
     def get_target_filename(self, t):
         if isinstance(t, build.CustomTarget):
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 9a41fab..9b3fdc7 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1540,8 +1540,8 @@ class ModuleHolder(InterpreterObject, ObjectHolder):
         # because the Build object contains dicts and lists.
         num_targets = len(self.interpreter.build.targets)
         state = ModuleState(
-            build_to_src=os.path.relpath(self.interpreter.environment.get_source_dir(),
-                                         self.interpreter.environment.get_build_dir()),
+            build_to_src=mesonlib.relpath(self.interpreter.environment.get_source_dir(),
+                                          self.interpreter.environment.get_build_dir()),
             subproject=self.interpreter.subproject,
             subdir=self.interpreter.subdir,
             current_lineno=self.interpreter.current_lineno,
@@ -2182,14 +2182,7 @@ external dependencies (including libraries) must go to "dependencies".''')
                 raise InterpreterException('Program or command {!r} not found '
                                            'or not executable'.format(cmd))
             cmd = prog
-        try:
-            cmd_path = os.path.relpath(cmd.get_path(), start=srcdir)
-        except ValueError:
-            # On Windows a relative path can't be evaluated for
-            # paths on two different drives (i.e. c:\foo and f:\bar).
-            # The only thing left to is is to use the original absolute
-            # path.
-            cmd_path = cmd.get_path()
+        cmd_path = mesonlib.relpath(cmd.get_path(), start=srcdir)
         if not cmd_path.startswith('..') and cmd_path not in self.build_def_files:
             self.build_def_files.append(cmd_path)
         expanded_args = []
@@ -2206,7 +2199,7 @@ external dependencies (including libraries) must go to "dependencies".''')
             if not os.path.isabs(a):
                 a = os.path.join(builddir if in_builddir else srcdir, self.subdir, a)
             if os.path.isfile(a):
-                a = os.path.relpath(a, start=srcdir)
+                a = mesonlib.relpath(a, start=srcdir)
                 if not a.startswith('..'):
                     if a not in self.build_def_files:
                         self.build_def_files.append(a)
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index 33900b6..dfd4687 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -1143,3 +1143,12 @@ class BuildDirLock:
         elif have_msvcrt:
             msvcrt.locking(self.lockfile.fileno(), msvcrt.LK_UNLCK, 1)
         self.lockfile.close()
+
+def relpath(path, start):
+    # On Windows a relative path can't be evaluated for paths on two different
+    # drives (i.e. c:\foo and f:\bar).  The only thing left to do is to use the
+    # original absolute path.
+    try:
+        return os.path.relpath(path, start)
+    except ValueError:
+        return path