Fixes an issue where OutputDirectory and IntermediateDirectory were being

pylib/gyp/MSVSSettings.py

Index: pylib/gyp/MSVSSettings.py
===================================================================
--- pylib/gyp/MSVSSettings.py	(revision 1452)
+++ pylib/gyp/MSVSSettings.py	(working copy)
@@ -15,8 +15,8 @@
 """
 
 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 = {}
@@ -362,6 +362,24 @@
   _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.
 
@@ -378,14 +396,10 @@
         '$(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