Added support of the PlatformToolset property to Gyp (MSBuild only).

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 1643 matching lines @@
 
   # Select project file format version (if unset, default to auto detecting).
   msvs_version = MSVSVersion.SelectVisualStudioVersion(
       generator_flags.get('msvs_version', 'auto'))
   # Stash msvs_version for later (so we don't have to probe the system twice).
   params['msvs_version'] = msvs_version
 
   # Set a variable so conditions can be based on msvs_version.
   default_variables['MSVS_VERSION'] = msvs_version.ShortName()
 
+  # Use the platform toolset specified in the environment (MSBuild only)
+  msvs_toolset = generator_flags.get(
+      'msvs_toolset', os.environ.get('GYP_MSVS_TOOLSET', 'auto'))
+  generator_flags['msvs_toolset'] = msvs_toolset
+
   # To determine processor word size on Windows, in addition to checking
   # PROCESSOR_ARCHITECTURE (which reflects the word size of the current
   # process), it is also necessary to check PROCESSOR_ARCITEW6432 (which
   # contains the actual word size of the system when running thru WOW64).
   if (os.environ.get('PROCESSOR_ARCHITECTURE', '').find('64') >= 0 or
       os.environ.get('PROCESSOR_ARCHITEW6432', '').find('64') >= 0):
     default_variables['MSVS_OS_BITS'] = 64
   else:
     default_variables['MSVS_OS_BITS'] = 32
 
@@ skipping 1153 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)
+
+  # Specify a platform toolset for the project if set.
+  msvs_toolset = generator_flags.get('msvs_toolset', 'auto')

[bradn, 2012/02/15 06:23:17]

Rather than having this be a generator flag, could we base it on something in
spec/configuration? So it can be configured in common.gypi ? That way everyone
doesn't need to tweak their environment. If its set via a gyp variable with % it
can still be overridden as needed.

Little rusty on the scheme, I realize msbuild_settings clobbers msvs_settings,
so we probably can't add it to msbuild_settings?

[alexeypa (please no reviews), 2012/02/17 18:11:40]

This certainly makes sense. Take a look at the updated CL.

+  if msvs_toolset != 'auto':
+    content += [
+        ['PropertyGroup', {'Label': 'Locals'},
+         ['PlatformToolset', msvs_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)