fix shadow build with source and build dir on different Windows drives

Change-Id: Icf2f8bb7fc3e4e0631c619aa7dd092cc1ffd9152
Task-number: QTBUG-47686
Reviewed-by: Andras Becsi <[email protected]>
Reviewed-by: Peter Varga <[email protected]>

Author: jobor

chromium/third_party/WebKit/Source/bindings/scripts/compute_interfaces_info_individual.py

@@ -83,9 +83,18 @@ def parse_options():
 # Computations
 ################################################################################
 
+def maybeRelativePath(path, start):
+    if os.path.splitdrive(path)[0] == os.path.splitdrive(start)[0]:
+        return os.path.relpath(path, start)
+    return path
+
 def relative_dir_posix(idl_filename):
-    """Returns relative path to the directory of idl_file in POSIX format."""
-    relative_path_local = os.path.relpath(idl_filename, source_path)
+    """Returns relative path to the directory of idl_file in POSIX format.
+
+    On Windows, the absolute path to the directory is returned if source_path
+    and idl_filename are on different drives.
+    """
+    relative_path_local = maybeRelativePath(idl_filename, source_path)
     relative_dir_local = os.path.dirname(relative_path_local)
     return relative_dir_local.replace(os.path.sep, posixpath.sep)
 

chromium/tools/grit/grit/grd_reader.py

@@ -138,6 +138,11 @@ def ignorableWhitespace(self, whitespace):
     self.parent.ignorableWhitespace(whitespace)
 
 
+def maybeRelativePath(path, start):
+    if os.path.splitdrive(path)[0] == os.path.splitdrive(start)[0]:
+        return os.path.relpath(path, start)
+    return path
+
 def Parse(filename_or_stream, dir=None, stop_after=None, first_ids_file=None,
           debug=False, defines=None, tags_to_ignore=None, target_platform=None):
   '''Parses a GRD file into a tree of nodes (from grit.node).
@@ -207,7 +212,7 @@ def Parse(filename_or_stream, dir=None, stop_after=None, first_ids_file=None,
       GRIT_DIR_PREFIX = 'GRIT_DIR'
       if not (first_ids_file.startswith(GRIT_DIR_PREFIX)
           and first_ids_file[len(GRIT_DIR_PREFIX)] in ['/', '\\']):
-        rel_dir = os.path.relpath(os.getcwd(), dir)
+        rel_dir = maybeRelativePath(os.getcwd(), dir)
         first_ids_file = util.normpath(os.path.join(rel_dir, first_ids_file))
       handler.root.attrs['first_ids_file'] = first_ids_file
     # Assign first ids to the nodes that don't have them.