MSVS: Normalize paths against gyp directory.

pylib/gyp/generator/msvs.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import ntpath
 import os
 import posixpath
 import re
 import subprocess
@@ skipping 116 matching lines @@
       domain_match = domain_re.search(config)
       if domain_match:
         domain = domain_match.group(1)
     cached_domain = domain
     cached_username = username
   return (cached_domain, cached_username)
 
 fixpath_prefix = None
 
 
-def _NormalizedSource(source):
+def _NormalizedSource(source, curdir=None):
   """Normalize the path.
 
   But not if that gets rid of a variable, as this may expand to something
   larger than one directory.
 
   Arguments:
-      source: The path to be normalize.d
+      source: The path to be normalized
+      curdir: Current direcory to normalize against (optional)
 
   Returns:
       The normalized path.
   """
   normalized = os.path.normpath(source)
+  if curdir:
+    normalized = os.path.normpath(os.path.join(curdir, normalized))
+    normalized = os.path.relpath(normalized, curdir)
   if source.count('$') == normalized.count('$'):
     source = normalized
   return source
 
 
-def _FixPath(path):
+def _FixPath(path, curdir = None):

[scottmg, 2015/06/15 23:04:00]

no spaces here (sorry, I know it's annoying)

[Jamie Madill, 2015/06/15 23:08:37]

Done.

   """Convert paths to a form that will make sense in a vcproj file.
 
   Arguments:
     path: The path to convert, may contain / etc.
+    curdir: Current directory of path (optional)
   Returns:
     The path with all slashes made into backslashes.
   """
   if fixpath_prefix and path and not os.path.isabs(path) and not path[0] == '$':
     path = os.path.join(fixpath_prefix, path)
   path = path.replace('/', '\\')
-  path = _NormalizedSource(path)
+  path = _NormalizedSource(path, curdir)
   if path and path[-1] == '\\':
     path = path[:-1]
   return path
 
 
-def _FixPaths(paths):
+def _FixPaths(paths, curdir=None):
   """Fix each of the paths of the list."""
-  return [_FixPath(i) for i in paths]
+  return [_FixPath(i, curdir) for i in paths]
 
 
 def _ConvertSourcesToFilterHierarchy(sources, prefix=None, excluded=None,
                                      list_excluded=True, msvs_version=None):
   """Converts a list split source file paths into a vcproj folder hierarchy.
 
   Arguments:
     sources: A list of source file paths split.
     prefix: A list of source file path layers meant to apply to each of sources.
     excluded: A set of excluded files.
@@ skipping 1287 matching lines @@
     A trio of (list of sources, list of excluded sources,
                path of excluded IDL file)
   """
   # Exclude excluded sources coming into the generator.
   excluded_sources.update(OrderedSet(spec.get('sources_excluded', [])))
   # Add excluded sources into sources for good measure.
   sources.update(excluded_sources)
   # Convert to proper windows form.
   # NOTE: sources goes from being a set to a list here.
   # NOTE: excluded_sources goes from being a set to a list here.
-  sources = _FixPaths(sources)
+  sources = _FixPaths(sources, _FixPath(gyp_dir))
   # Convert to proper windows form.
   excluded_sources = _FixPaths(excluded_sources)
 
   excluded_idl = _IdlFilesHandledNonNatively(spec, sources)
 
   precompiled_related = _GetPrecompileRelatedFiles(spec)
   # Find the excluded ones, minus the precompiled header related ones.
   fully_excluded = [i for i in excluded_sources if i not in precompiled_related]
 
   # Convert to folders and the right slashes.
@@ skipping 1935 matching lines @@
   action_spec.extend(
       # TODO(jeanluc) 'Document' for all or just if as_sources?
       [['FileType', 'Document'],
        ['Command', command],
        ['Message', description],
        ['Outputs', outputs]
       ])
   if additional_inputs:
     action_spec.append(['AdditionalInputs', additional_inputs])
   actions_spec.append(action_spec)