Revert "I need this change to create Windows 8.1/Windows Phone 8.1 projects that compile modules th…

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 65 matching lines @@
 generator_additional_non_configuration_keys = [
     'msvs_cygwin_dirs',
     'msvs_cygwin_shell',
     'msvs_large_pdb',
     'msvs_shard',
     'msvs_external_builder',
     'msvs_external_builder_out_dir',
     'msvs_external_builder_build_cmd',
     'msvs_external_builder_clean_cmd',
     'msvs_external_builder_clcompile_cmd',
-    'msvs_enable_winrt',
-    'msvs_requires_importlibrary',
-    'msvs_enable_winphone',
 ]
 
 
 # List of precompiled header related keys.
 precomp_keys = [
     'msvs_precompiled_header',
     'msvs_precompiled_source',
 ]
 
 
@@ skipping 2492 matching lines @@
     designation = '%s|%s' % (configuration, platform)
     group.append(
         ['ProjectConfiguration', {'Include': designation},
          ['Configuration', configuration],
          ['Platform', platform]])
   return [group]
 
 
 def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
   namespace = os.path.splitext(gyp_file_name)[0]
-  properties = [
+  return [
       ['PropertyGroup', {'Label': 'Globals'},
-        ['ProjectGuid', guid],
-        ['Keyword', 'Win32Proj'],
-        ['RootNamespace', namespace],
-        ['IgnoreWarnCompileDuplicatedFilename', 'true'],
+       ['ProjectGuid', guid],
+       ['Keyword', 'Win32Proj'],
+       ['RootNamespace', namespace],
+       ['IgnoreWarnCompileDuplicatedFilename', 'true'],
       ]
-    ]
+  ]
 
-  if spec.get('msvs_enable_winrt'):
-    properties[0].append(['DefaultLanguage', 'en-US'])
-    properties[0].append(['AppContainerApplication', 'true'])
-    properties[0].append(['ApplicationTypeRevision', '8.1'])
-
-    if spec.get('msvs_enable_winphone'):
-      properties[0].append(['ApplicationType', 'Windows Phone'])
-    else:
-      properties[0].append(['ApplicationType', 'Windows Store'])
-
-  return properties
 
 def _GetMSBuildConfigurationDetails(spec, build_file):
   properties = {}
   for name, settings in spec['configurations'].iteritems():
     msbuild_attributes = _GetMSBuildAttributes(spec, settings, build_file)
     condition = _GetConfigurationCondition(name, settings)
     character_set = msbuild_attributes.get('CharacterSet')
     _AddConditionalProperty(properties, condition, 'ConfigurationType',
                             msbuild_attributes['ConfigurationType'])
     if character_set:
-      if 'msvs_enable_winrt' not in spec :
-        _AddConditionalProperty(properties, condition, 'CharacterSet',
-                                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],
@@ skipping 338 matching lines @@
   _ToolAppend(msbuild_settings, 'ClCompile',
               'DisableSpecificWarnings', disabled_warnings)
   # Turn on precompiled headers if appropriate.
   if precompiled_header:
     precompiled_header = os.path.split(precompiled_header)[1]
     _ToolAppend(msbuild_settings, 'ClCompile', 'PrecompiledHeader', 'Use')
     _ToolAppend(msbuild_settings, 'ClCompile',
                 'PrecompiledHeaderFile', precompiled_header)
     _ToolAppend(msbuild_settings, 'ClCompile',
                 'ForcedIncludeFiles', [precompiled_header])
-  else:
-    _ToolAppend(msbuild_settings, 'ClCompile', 'PrecompiledHeader', 'NotUsing')
-  # Turn off WinRT compilation
-  _ToolAppend(msbuild_settings, 'ClCompile', 'CompileAsWinRT', 'false')
-  # Turn on import libraries if appropriate
-  if spec.get('msvs_requires_importlibrary'):
-   _ToolAppend(msbuild_settings, '', 'IgnoreImportLibrary', 'false')
   # Loadable modules don't generate import libraries;
   # tell dependent projects to not expect one.
   if spec['type'] == 'loadable_module':
     _ToolAppend(msbuild_settings, '', 'IgnoreImportLibrary', 'true')
   # Set the module definition file if any.
   if def_file:
     _ToolAppend(msbuild_settings, 'Link', 'ModuleDefinitionFile', def_file)
   configuration['finalized_msbuild_settings'] = msbuild_settings
   if prebuild:
     _ToolAppend(msbuild_settings, 'PreBuildEvent', 'Command', prebuild)
@@ skipping 220 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)
-  if spec.get('msvs_enable_winphone'):
-   content += _GetMSBuildLocalProperties('v120_wp81')
-  else:
-   content += _GetMSBuildLocalProperties(project.msbuild_toolset)
+  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 127 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)