Fixes an issue where OutputDirectory and IntermediateDirectory were being

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 21 matching lines @@
 
 
 generator_default_variables = {
     'EXECUTABLE_PREFIX': '',
     'EXECUTABLE_SUFFIX': '.exe',
     'STATIC_LIB_PREFIX': '',
     'SHARED_LIB_PREFIX': '',
     'STATIC_LIB_SUFFIX': '.lib',
     'SHARED_LIB_SUFFIX': '.dll',
     'INTERMEDIATE_DIR': '$(IntDir)',
-    'SHARED_INTERMEDIATE_DIR': '$(OutDir)/obj/global_intermediate',
+    'SHARED_INTERMEDIATE_DIR': '$(OutDir)obj/global_intermediate',
     'OS': 'win',
     'PRODUCT_DIR': '$(OutDir)',
-    'LIB_DIR': '$(OutDir)\\lib',
+    'LIB_DIR': '$(OutDir)lib',
     'RULE_INPUT_ROOT': '$(InputName)',
     'RULE_INPUT_DIRNAME': '$(InputDir)',
     'RULE_INPUT_EXT': '$(InputExt)',
     'RULE_INPUT_NAME': '$(InputFileName)',
     'RULE_INPUT_PATH': '$(InputPath)',
     'CONFIGURATION_NAME': '$(ConfigurationName)',
 }
 
 
 # The msvs specific sections that hold paths
@@ skipping 238 matching lines @@
       command = ['type']
     else:
       command = [cmd[0].replace('/', '\\')]
     # Fix the paths
     # TODO(quote): This is a really ugly heuristic, and will miss path fixing
     #              for arguments like "--arg=path" or "/opt:path".
     # If the argument starts with a slash or dash, it's probably a command line
     # switch
     arguments = [i if (i[:1] in "/-") else _FixPath(i) for i in cmd[1:]]
     arguments = [i.replace('$(InputDir)','%INPUTDIR%') for i in arguments]
+    arguments = [MSVSSettings.FixVCMacroSlashes(i) for i in arguments]
     if quote_cmd:
       # Support a mode for using cmd directly.
       # Convert any paths to native form (first element is used directly).
       # TODO(quote):  regularize quoting path names throughout the module
       arguments = ['"%s"' % i for i in arguments]
     # Collapse into a single command.
     return input_dir_preamble + ' '.join(command + arguments)
 
 
 def _BuildCommandLineForRule(spec, rule, has_input_path, do_setup_env):
@@ skipping 730 matching lines @@
   _ToolAppend(tools, 'VCLinkerTool', 'AdditionalDependencies', libraries)
   if out_file:
     _ToolAppend(tools, vc_tool, 'OutputFile', out_file, only_if_unset=True)
   # Add defines.
   _ToolAppend(tools, 'VCCLCompilerTool', 'PreprocessorDefinitions', defines)
   _ToolAppend(tools, 'VCResourceCompilerTool', 'PreprocessorDefinitions',
               defines)
   _ToolAppend(tools, 'VCMIDLTool', 'PreprocessorDefinitions', defines)
   # Change program database directory to prevent collisions.
   _ToolAppend(tools, 'VCCLCompilerTool', 'ProgramDataBaseFileName',
-              '$(IntDir)\\$(ProjectName)\\vc80.pdb', only_if_unset=True)
+              '$(IntDir)$(ProjectName)\\vc80.pdb', only_if_unset=True)
   # Add disabled warnings.
   _ToolAppend(tools, 'VCCLCompilerTool',
               'DisableSpecificWarnings', disabled_warnings)
   # Add Pre-build.
   _ToolAppend(tools, 'VCPreBuildEventTool', 'CommandLine', prebuild)
   # Add Post-build.
   _ToolAppend(tools, 'VCPostBuildEventTool', 'CommandLine', postbuild)
   # Turn on precompiled headers if appropriate.
   if precompiled_header:
     precompiled_header = os.path.split(precompiled_header)[1]
@@ skipping 66 matching lines @@
   Arguments:
     spec: The target dictionary containing the properties of the target.
   Returns:
     A triple of (file path, name of the vc tool, name of the msbuild tool)
   """
   # Select a name for the output file.
   out_file = ''
   vc_tool = ''
   msbuild_tool = ''
   output_file_map = {
-      'executable': ('VCLinkerTool', 'Link', '$(OutDir)\\', '.exe'),
-      'shared_library': ('VCLinkerTool', 'Link', '$(OutDir)\\', '.dll'),
-      'loadable_module': ('VCLinkerTool', 'Link', '$(OutDir)\\', '.dll'),
-      'static_library': ('VCLibrarianTool', 'Lib', '$(OutDir)\\lib\\', '.lib'),
+      'executable': ('VCLinkerTool', 'Link', '$(OutDir)', '.exe'),
+      'shared_library': ('VCLinkerTool', 'Link', '$(OutDir)', '.dll'),
+      'loadable_module': ('VCLinkerTool', 'Link', '$(OutDir)', '.dll'),
+      'static_library': ('VCLibrarianTool', 'Lib', '$(OutDir)lib\\', '.lib'),
   }
   output_file_props = output_file_map.get(spec['type'])
   if output_file_props and int(spec.get('msvs_auto_output_file', 1)):
     vc_tool, msbuild_tool, out_dir, suffix = output_file_props
     out_dir = spec.get('product_dir', out_dir)
     product_extension = spec.get('product_extension')
     if product_extension:
       suffix = '.' + product_extension
     prefix = spec.get('product_prefix', '')
     product_name = spec.get('product_name', '$(ProjectName)')
@@ skipping 92 matching lines @@
     prepared_attrs[a] = source_attrs[a]
   # Add props files.
   vsprops_dirs = config.get('msvs_props', [])
   vsprops_dirs = _FixPaths(vsprops_dirs)
   if vsprops_dirs:
     prepared_attrs['InheritedPropertySheets'] = ';'.join(vsprops_dirs)
   # Set configuration type.
   prepared_attrs['ConfigurationType'] = config_type
   output_dir = prepared_attrs.get('OutputDirectory',
                                   '$(SolutionDir)$(ConfigurationName)')
-  prepared_attrs['OutputDirectory'] = _FixPath(output_dir)
+  prepared_attrs['OutputDirectory'] = _FixPath(output_dir)+"\\"

[scottmg, 2012/08/08 22:02:56]

spaces and ' not "

[iannucci, 2012/08/08 22:09:44]

Done

   if 'IntermediateDirectory' not in prepared_attrs:
     intermediate = '$(ConfigurationName)\\obj\\$(ProjectName)'
-    prepared_attrs['IntermediateDirectory'] = _FixPath(intermediate)
+    prepared_attrs['IntermediateDirectory'] = _FixPath(intermediate)+"\\"

[scottmg, 2012/08/08 22:02:56]

same

[iannucci, 2012/08/08 22:09:44]

and done

   return prepared_attrs
 
 
 def _AddNormalizedSources(sources_set, sources_array):
   sources = [_NormalizedSource(s) for s in sources_array]
   sources_set.update(set(sources))
 
 
 def _PrepareListOfSources(spec, gyp_file):
   """Prepare list of sources and excluded sources.
@@ skipping 1851 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)