Use relative path/dir msbuild variables to map $(InputDir) and $(InputPath)

pylib/gyp/MSVSSettings.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.
 
 """Code to validate and convert settings of the Microsoft build tools.
 
 This file contains code to validate and convert settings of the Microsoft
 build tools.  The function ConvertToMSBuildSettings(), ValidateMSVSSettings(),
 and ValidateMSBuildSettings() are the entry points.
 
@@ skipping 399 matching lines @@
 
 
 def ConvertVCMacrosToMSBuild(s):
   """Convert the the MSVS macros found in the string to the MSBuild equivalent.
 
   This list is probably not exhaustive.  Add as needed.
   """
   if '$' in s:
     replace_map = {
         '$(ConfigurationName)': '$(Configuration)',
-        '$(InputDir)': '%(RootDir)%(Directory)',
+        '$(InputDir)': '%(RelativeDir)',
         '$(InputExt)': '%(Extension)',
         '$(InputFileName)': '%(Filename)%(Extension)',
         '$(InputName)': '%(Filename)',
-        '$(InputPath)': '%(FullPath)',
+        '$(InputPath)': '%(Identity)',
         '$(ParentName)': '$(ProjectFileName)',
         '$(PlatformName)': '$(Platform)',
         '$(SafeInputName)': '%(Filename)',
     }
     for old, new in replace_map.iteritems():
       s = s.replace(old, new)
     s = FixVCMacroSlashes(s)
   return s
 
 
@@ skipping 634 matching lines @@
 _MSVSOnly(_manifest, 'UseUnicodeResponseFiles', _boolean)
 
 # MSBuild options not found in MSVS.
 _MSBuildOnly(_manifest, 'EnableDPIAwareness', _boolean)
 _MSBuildOnly(_manifest, 'GenerateCategoryTags', _boolean)  # /category
 _MSBuildOnly(_manifest, 'ManifestFromManagedAssembly',
              _file_name)  # /managedassemblyname
 _MSBuildOnly(_manifest, 'OutputResourceManifests', _string)  # /outputresource
 _MSBuildOnly(_manifest, 'SuppressDependencyElement', _boolean)  # /nodependency
 _MSBuildOnly(_manifest, 'TrackerLogDirectory', _folder_name)