Reland "msvs/ninja win: Fix support for ImageHasSafeExceptionHandlers"

pylib/gyp/MSVSSettings.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.
 
 r"""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.
 
@@ skipping 296 matching lines @@
 
 
 def _MSBuildOnly(tool, name, setting_type):
   """Defines a setting that is only found in MSBuild.
 
   Args:
     tool: a dictionary that gives the names of the tool for MSVS and MSBuild.
     name: the name of the setting.
     setting_type: the type of this setting.
   """
+
+  def _Translate(value, msbuild_settings):
+    # Let msbuild-only properties get translated as-is from msvs_settings.
+    tool_settings = msbuild_settings.setdefault(tool.msbuild_name, {})
+    tool_settings[name] = value
+
   _msbuild_validators[tool.msbuild_name][name] = setting_type.ValidateMSBuild
+  _msvs_to_msbuild_converters[tool.msvs_name][name] = _Translate
 
 
 def _ConvertedToAdditionalOption(tool, msvs_name, flag):
   """Defines a setting that's handled via a command line option in MSBuild.
 
   Args:
     tool: a dictionary that gives the names of the tool for MSVS and MSBuild.
     msvs_name: the name of the MSVS setting that if 'true' becomes a flag
     flag: the flag to insert at the end of the AdditionalOptions
   """
@@ skipping 196 matching lines @@
       print >> stderr, ('Warning: unrecognized tool %s' % tool_name)
 
 
 # MSVS and MBuild names of the tools.
 _compile = _Tool('VCCLCompilerTool', 'ClCompile')
 _link = _Tool('VCLinkerTool', 'Link')
 _midl = _Tool('VCMIDLTool', 'Midl')
 _rc = _Tool('VCResourceCompilerTool', 'ResourceCompile')
 _lib = _Tool('VCLibrarianTool', 'Lib')
 _manifest = _Tool('VCManifestTool', 'Manifest')
+_masm = _Tool('MASM', 'MASM')
 
 
 _AddTool(_compile)
 _AddTool(_link)
 _AddTool(_midl)
 _AddTool(_rc)
 _AddTool(_lib)
 _AddTool(_manifest)
+_AddTool(_masm)
 # Add sections only found in the MSBuild settings.
 _msbuild_validators[''] = {}
 _msbuild_validators['ProjectReference'] = {}
 _msbuild_validators['ManifestResourceCompile'] = {}
 
 # Descriptions of the compiler options, i.e. VCCLCompilerTool in MSVS and
 # ClCompile in MSBuild.
 # See "c:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\1033\cl.xml" for
 # the schema of the MSBuild ClCompile settings.
 
@@ skipping 521 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)
+
+
+# Directives for MASM.
+# See "$(VCTargetsPath)\BuildCustomizations\masm.xml" for the schema of the
+# MSBuild MASM settings.
+
+# Options that have the same name in MSVS and MSBuild.
+_Same(_masm, 'UseSafeExceptionHandlers', _boolean)  # /safeseh