Revert r1228.

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 815 matching lines @@
   guid = default_config.get('msvs_guid')
   if guid:
     if VALID_MSVS_GUID_CHARS.match(guid) is None:
       raise ValueError('Invalid MSVS guid: "%s".  Must match regex: "%s".' %
                        (guid, VALID_MSVS_GUID_CHARS.pattern))
     guid = '{%s}' % guid
   guid = guid or MSVSNew.MakeGuid(proj_path)
   return guid
 
 
-def _GetMsbuildToolsetOfProject(proj_path, spec):
-  """Get the platform toolset for the project.
-
-  Arguments:
-    proj_path: Path of the vcproj or vcxproj file to generate.
-    spec: The target dictionary containing the properties of the target.
-  Returns:
-    the platform toolset string or None.
-  """
-  # Pluck out the default configuration.
-  default_config = _GetDefaultConfiguration(spec)
-  return default_config.get('msbuild_toolset')
-
-
 def _GenerateProject(project, options, version, generator_flags):
   """Generates a vcproj file.
 
   Arguments:
     project: the MSVSProject object.
     options: global generator options.
     version: the MSVSVersion object.
     generator_flags: dict of generator-specific flags.
   """
   default_config = _GetDefaultConfiguration(project.spec)
@@ skipping 785 matching lines @@
     build_file = gyp.common.BuildFile(qualified_target)
     # Create object for this project.
     obj = MSVSNew.MSVSProject(
         _FixPath(proj_path),
         name=spec['target_name'],
         guid=guid,
         spec=spec,
         build_file=build_file,
         config_platform_overrides=overrides,
         fixpath_prefix=fixpath_prefix)
-    # Set project toolset if any (MS build only)
-    if msvs_version.UsesVcxproj():
-      obj.set_msbuild_toolset(_GetMsbuildToolsetOfProject(proj_path, spec))
     projects[qualified_target] = obj
   # Set all the dependencies
   for project in projects.values():
     deps = project.spec.get('dependencies', [])
     deps = [projects[d] for d in deps]
     project.set_dependencies(deps)
   return projects
 
 
 def CalculateVariables(default_variables, params):
@@ skipping 743 matching lines @@
     condition = _GetConfigurationCondition(name, settings)
     character_set = msbuild_attributes.get('CharacterSet')
     _AddConditionalProperty(properties, condition, 'ConfigurationType',
                             msbuild_attributes['ConfigurationType'])
     if character_set:
       _AddConditionalProperty(properties, condition, 'CharacterSet',
                               character_set)
   return _GetMSBuildPropertyGroup(spec, 'Configuration', properties)
 
 
-def _GetMSBuildLocalProperties(msbuild_toolset):
-  # Currently the only local property we support is PlatformToolset
-  properties = {}
-  if msbuild_toolset:
-    properties = [
-        ['PropertyGroup', {'Label': 'Locals'},
-          ['PlatformToolset', msbuild_toolset],
-        ]
-      ]
-  return properties
-
-
 def _GetMSBuildPropertySheets(configurations):
   user_props = r'$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'
   return [
       ['ImportGroup',
        {'Label': 'PropertySheets'},
        ['Import',
         {'Project': user_props,
          'Condition': "exists('%s')" % user_props,
          'Label': 'LocalAppDataPlatform'
         }
@@ skipping 413 matching lines @@
       'Project',
       {'xmlns': 'http://schemas.microsoft.com/developer/msbuild/2003',
        'ToolsVersion': version.ProjectVersion(),
        'DefaultTargets': 'Build'
       }]
 
   content += _GetMSBuildProjectConfigurations(configurations)
   content += _GetMSBuildGlobalProperties(spec, project.guid, project_file_name)
   content += import_default_section
   content += _GetMSBuildConfigurationDetails(spec, project.build_file)
-  content += _GetMSBuildLocalProperties(project.msbuild_toolset)
   content += import_cpp_props_section
   content += _GetMSBuildExtensions(props_files_of_rules)
   content += _GetMSBuildPropertySheets(configurations)
   content += macro_section
   content += _GetMSBuildConfigurationGlobalProperties(spec, configurations,
                                                       project.build_file)
   content += _GetMSBuildToolSettingsSections(spec, configurations)
   content += _GetMSBuildSources(
       spec, sources, exclusions, extension_to_rule_name, actions_spec,
       sources_handled_by_action, list_excluded)
@@ skipping 79 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)