Fixing mistake in the mapping of manifest settings from vcbuild to msbuild.

pylib/gyp/MSVSSettings_test.py

 #!/usr/bin/env python
 
-# Copyright (c) 2011 Google Inc. All rights reserved.
+# 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.
 
 """Unit tests for the MSVSSettings.py file."""
 
 import StringIO
 import unittest
 import gyp.MSVSSettings as MSVSSettings
 
 
@@ skipping 493 matching lines @@
              'Name': 'a_file_name',
              'OutputFile': 'a_file_name',
              'RemoveObjects': 'file1;file2',
              'SubSystem': 'Console',
              'SuppressStartupBanner': 'true',
              'TargetMachine': 'MachineX86i',
              'TrackerLogDirectory': 'a_folder',
              'TreatLibWarningAsErrors': 'true',
              'UseUnicodeResponseFiles': 'true',
              'Verbose': 'true'},
-         'Mt': {
+         'Manifest': {
              'AdditionalManifestFiles': 'file1;file2',
              'AdditionalOptions': 'a string1',
              'AssemblyIdentity': 'a string1',
              'ComponentFileName': 'a_file_name',
              'EnableDPIAwareness': 'fal',
              'GenerateCatalogFiles': 'truel',
              'GenerateCategoryTags': 'true',
              'InputResourceManifests': 'a string1',
              'ManifestFromManagedAssembly': 'a_file_name',
              'notgood3': 'bogus',
@@ skipping 15 matching lines @@
              'ResourceOutputFileName': 'a_file_name'},
          '': {
              'EmbedManifest': 'true',
              'GenerateManifest': 'true',
              'IgnoreImportLibrary': 'true',
              'LinkIncremental': 'false'}},
         self.stderr)
     self._ExpectedWarnings([
         'Warning: unrecognized setting ClCompile/Enableprefast',
         'Warning: unrecognized setting ClCompile/ZZXYZ',
-        'Warning: unrecognized setting Mt/notgood3',
-        "Warning: for Mt/GenerateCatalogFiles, expected bool; got 'truel'",
+        'Warning: unrecognized setting Manifest/notgood3',
+        'Warning: for Manifest/GenerateCatalogFiles, '
+        "expected bool; got 'truel'",
         'Warning: for Lib/TargetMachine, unrecognized enumerated value '
         'MachineX86i',
-        "Warning: for Mt/EnableDPIAwareness, expected bool; got 'fal'"])
+        "Warning: for Manifest/EnableDPIAwareness, expected bool; got 'fal'"])
 
   def testConvertToMSBuildSettings_empty(self):
     """Tests an empty conversion."""
     msvs_settings = {}
     expected_msbuild_settings = {}
     actual_msbuild_settings = MSVSSettings.ConvertToMSBuildSettings(
         msvs_settings,
         self.stderr)
     self.assertEqual(expected_msbuild_settings, actual_msbuild_settings)
     self._ExpectedWarnings([])
@@ skipping 479 matching lines @@
             'AdditionalLibraryDirectories': 'folder1;folder2;folder3',
             'AdditionalOptions': 'a_string',
             'ExportNamedFunctions': 'd1;d2;d3',
             'ForceSymbolReferences': 'a_string',
             'IgnoreAllDefaultLibraries': 'true',
             'IgnoreSpecificDefaultLibraries': 'file1;file2;file3',
             'ModuleDefinitionFile': 'a_file_name',
             'OutputFile': 'a_file_name',
             'SuppressStartupBanner': 'true',
             'UseUnicodeResponseFiles': 'true'},
-        'Mt': {
+        'Manifest': {
             'AdditionalManifestFiles': 'file1;file2;file3',
             'AdditionalOptions': 'a_string',
             'AssemblyIdentity': 'a_string',
             'ComponentFileName': 'a_file_name',
             'GenerateCatalogFiles': 'true',
             'InputResourceManifests': 'a_string',
             'OutputManifestFile': 'a_file_name',
             'RegistrarScriptFile': 'a_file_name',
             'ReplacementsFile': 'a_file_name',
             'SuppressStartupBanner': 'true',
@@ skipping 49 matching lines @@
             AssemblyLinkResource:  ';%(AssemblyLinkResource)',
             DelayLoadDLLs:  ';%(DelayLoadDLLs)',
             EmbedManagedResourceFile:  ';%(EmbedManagedResourceFile)',
             ForceSymbolReferences:  ';%(ForceSymbolReferences)',
             IgnoreSpecificDefaultLibraries:
                 ';%(IgnoreSpecificDefaultLibraries)',
         ResourceCompile:
             AdditionalIncludeDirectories:  ';%(AdditionalIncludeDirectories)',
             AdditionalOptions:  ' %(AdditionalOptions)',
             PreprocessorDefinitions:  ';%(PreprocessorDefinitions)',
-        Mt:
+        Manifest:
             AdditionalManifestFiles:  ';%(AdditionalManifestFiles)',
             AdditionalOptions:  ' %(AdditionalOptions)',
             InputResourceManifests:  ';%(InputResourceManifests)',
     """
     msvs_settings = {
         'VCCLCompilerTool': {
             'AdditionalIncludeDirectories': 'dir1',
             'AdditionalOptions': '/more',
             'AdditionalUsingDirectories': 'test',
             'AssemblerListingLocation': '$(IntDir)\\a',
@@ skipping 297 matching lines @@
             'UACUIAccess': 'true',
             'Version': '333'},
         'ResourceCompile': {
             'AdditionalIncludeDirectories': 'f3',
             'AdditionalOptions': '/more3',
             'Culture': '0x0c0c',
             'IgnoreStandardIncludePath': 'true',
             'PreprocessorDefinitions': '_UNICODE;UNICODE2',
             'ResourceOutputFileName': '$(IntDir)%(Filename)3.res',
             'ShowProgress': 'true'},
-        'Mt': {
+        'Manifest': {
             'AdditionalManifestFiles': 'sfsdfsd',
             'AdditionalOptions': 'afdsdafsd',
             'AssemblyIdentity': 'sddfdsadfsa',
             'ComponentFileName': 'fsdfds',
             'GenerateCatalogFiles': 'true',
             'InputResourceManifests': 'asfsfdafs',
             'OutputManifestFile': '$(TargetPath).manifestdfs',
             'RegistrarScriptFile': 'sdfsfd',
             'ReplacementsFile': 'sdffsd',
             'SuppressStartupBanner': 'false',
@@ skipping 16 matching lines @@
         }
     actual_msbuild_settings = MSVSSettings.ConvertToMSBuildSettings(
         msvs_settings,
         self.stderr)
     self.assertEqual(expected_msbuild_settings, actual_msbuild_settings)
     self._ExpectedWarnings([])
 
 
 if __name__ == '__main__':
   unittest.main()