Fixes an issue where OutputDirectory and IntermediateDirectory were being

pylib/gyp/MSVSSettings.py

 # Copyright (c) 2012 The Chromium Authors. 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.
 
 This file was created by comparing the projects created by Visual Studio 2008
 and Visual Studio 2010 for all available settings through the user interface.
 The MSBuild schemas were also considered.  They are typically found in the
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
 
 import sys
-
+import re
 
 # Dictionaries of settings validators. The key is the tool name, the value is
 # a dictionary mapping setting names to validation functions.
 _msvs_validators = {}
 _msbuild_validators = {}
 
 
 # A dictionary of settings converters. The key is the tool name, the value is
 # a dictionary mapping setting names to conversion functions.
 _msvs_to_msbuild_converters = {}
@@ skipping 326 matching lines @@
   # Create a bogus validator that looks for '0', '1', or '2'
   msvs_validator = _Enumeration(['a', 'b', 'c']).ValidateMSVS
   _msvs_validators[tool.msvs_name][msvs_name] = msvs_validator
   msbuild_validator = _boolean.ValidateMSBuild
   msbuild_tool_validators = _msbuild_validators[tool.msbuild_name]
   msbuild_tool_validators['PreprocessToFile'] = msbuild_validator
   msbuild_tool_validators['PreprocessSuppressLineNumbers'] = msbuild_validator
   _msvs_to_msbuild_converters[tool.msvs_name][msvs_name] = _Translate
 
 
+fix_vc_macro_slashes_regex_list = ('IntDir', 'OutDir')
+fix_vc_macro_slashes_regex = re.compile(
+  r'(\$\((?:%s)\))(?:[\\/]+)' % "|".join(fix_vc_macro_slashes_regex_list)
+)
+
+def FixVCMacroSlashes(s):
+  """Replace macros which have excessive following slashes.
+
+  These macros are known to have a built-in trailing slash. Furthermore, many
+  scripts hiccup on processing paths with extra slashes in the middle.
+
+  This list is probably not exhaustive.  Add as needed.
+  """
+  if '$' in s:
+    s = fix_vc_macro_slashes_regex.sub(r'\1', s)
+  return s
+
+
 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)',
         '$(InputExt)': '%(Extension)',
         '$(InputFileName)': '%(Filename)%(Extension)',
         '$(InputName)': '%(Filename)',
         '$(InputPath)': '%(FullPath)',
         '$(ParentName)': '$(ProjectFileName)',
         '$(PlatformName)': '$(Platform)',
         '$(SafeInputName)': '%(Filename)',
-
-        '$(IntDir)\\': '$(IntDir)',
-        '$(OutDir)\\': '$(OutDir)',
-        '$(IntDir)/': '$(IntDir)',
-        '$(OutDir)/': '$(OutDir)',
     }
     for old, new in replace_map.iteritems():
       s = s.replace(old, new)
+    s = FixVCMacroSlashes(s)
   return s
 
 
 def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
   """Converts MSVS settings (VS2008 and earlier) to MSBuild settings (VS2010+).
 
   Args:
       msvs_settings: A dictionary.  The key is the tool name.  The values are
           themselves dictionaries of settings and their values.
       stderr: The stream receiving the error messages.
@@ skipping 624 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)