Enabling /ZW (CompileAsWinRT) option for msvs

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 239 matching lines @@
 def _ToolSetOrAppend(tools, tool_name, setting, value, only_if_unset=False):
   # TODO(bradnelson): ugly hack, fix this more generally!!!
   if 'Directories' in setting or 'Dependencies' in setting:
     if type(value) == str:
       value = value.replace('/', '\\')
     else:
       value = [i.replace('/', '\\') for i in value]
   if not tools.get(tool_name):
     tools[tool_name] = dict()
   tool = tools[tool_name]
+  if 'CompileAsWinRT' == setting: return

[scottmg, 2016/04/04 22:05:17]

return on separate line

[munyirik, 2016/04/11 20:07:10]

Acknowledged.

   if tool.get(setting):
     if only_if_unset: return
     if type(tool[setting]) == list and type(value) == list:
       tool[setting] += value
     else:
       raise TypeError(
           'Appending "%s" to a non-list setting "%s" for tool "%s" is '
           'not allowed, previous value: %s' % (
               value, setting, tool_name, str(tool[setting])))
   else:
     tool[setting] = value
 
 
 def _ConfigPlatform(config_data):
   return config_data.get('msvs_configuration_platform', 'Win32')
 
 
 def _ConfigBaseName(config_name, platform_name):
   if config_name.endswith('_' + platform_name):
     return config_name[0:-len(platform_name) - 1]
   else:
     return config_name
 
 
 def _ConfigFullName(config_name, config_data):
   platform_name = _ConfigPlatform(config_data)
   return '%s|%s' % (_ConfigBaseName(config_name, platform_name), platform_name)
 
 
+def _ConfigWindowsTargetPlatformVersion(config_data):
+  ver = config_data.get('msvs_windows_sdk_version')
+  if not ver or re.match(r'^\d+', ver):

[scottmg, 2016/04/04 22:05:17]

What's the re for? This will be something like 'v10.0' right?

[munyirik, 2016/04/11 20:07:10]

That was a typo in the gyp file. The string will be something like '10.0', not
'v10.0'. Will fix.
[EDIT] - disregard last comment, re is not needed.

+    return ver
+  for key in [r'HKLM\Software\Microsoft\Microsoft SDKs\Windows\%s',
+              r'HKLM\Software\Wow6432Node\Microsoft\Microsoft SDKs\Windows\%s']:
+    sdkdir = MSVSVersion._RegistryGetValue(key % ver, 'InstallationFolder')

[scottmg, 2016/04/04 22:05:17]

nit; sdk_dir looks nicer.

[munyirik, 2016/04/11 20:07:10]

Acknowledged.

+    if not sdkdir:
+      continue
+    version = MSVSVersion._RegistryGetValue(key % ver, 'ProductVersion') or ''
+    # find a matching entry in sdkdir\include

[scottmg, 2016/04/04 22:05:17]

nit; Capital F, end sentence with '.'.

[munyirik, 2016/04/11 20:07:10]

Acknowledged.

+    names = sorted([x for x in os.listdir(r'%s\include' % sdkdir) \

[scottmg, 2016/04/04 22:05:17]

Why do we need to use the prefix and then reverse sort rather than just looking
for a match?

[munyirik, 2016/04/11 20:07:09]

The reason is to get the latest SDK version. If someone wants to specify the
exact SDK number they can use msvs_target_platform_version.

+                    if x.startswith(version)], reverse = True)

[scottmg, 2016/04/04 22:05:17]

nit; no spaces in "reverse=True".

[munyirik, 2016/04/11 20:07:10]

Acknowledged.

+    return names[0]
+
+
 def _BuildCommandLineForRuleRaw(spec, cmd, cygwin_shell, has_input_path,
                                 quote_cmd, do_setup_env):
 
   if [x for x in cmd if '$(InputDir)' in x]:
     input_dir_preamble = (
       'set INPUTDIR=$(InputDir)\n'
       'if NOT DEFINED INPUTDIR set INPUTDIR=.\\\n'
       'set INPUTDIR=%INPUTDIR:~0,-1%\n'
       )
   else:
@@ skipping 33 matching lines @@
     cmd += 'bash -c "%(cmd)s"'
     cmd = cmd % {'cygwin_dir': cygwin_dir,
                  'cmd': direct_cmd}
     return input_dir_preamble + cmd
   else:
     # Convert cat --> type to mimic unix.
     if cmd[0] == 'cat':
       command = ['type']
     else:
       command = [cmd[0].replace('/', '\\')]
+    if quote_cmd:
+      command = ['"%s"' % i for i in command]
     # Add call before command to ensure that commands can be tied together one
     # after the other without aborting in Incredibuild, since IB makes a bat
     # file out of the raw command string, and some commands (like python) are
     # actually batch files themselves.
     command.insert(0, 'call')
     # Fix the paths
     # TODO(quote): This is a really ugly heuristic, and will miss path fixing
     #              for arguments like "--arg=path" or "/opt:path".
     # If the argument starts with a slash or dash, it's probably a command line
     # switch
@@ skipping 2317 matching lines @@
         properties[0].append(['WindowsTargetPlatformMinVersion',
                               target_platform_minversion])
       else:
         properties[0].append(['WindowsTargetPlatformMinVersion',
                               target_platform_version])
     if spec.get('msvs_enable_winphone'):
       properties[0].append(['ApplicationType', 'Windows Phone'])
     else:
       properties[0].append(['ApplicationType', 'Windows Store'])
 
+  platform_name = None
+  msvs_windows_sdk_version = None
+  for configuration in spec['configurations'].itervalues():
+    platform_name = platform_name or _ConfigPlatform(configuration)
+    msvs_windows_sdk_version = \

[scottmg, 2016/04/04 22:05:17]

Instead of using \, put () around the whole expression.

[munyirik, 2016/04/11 20:07:10]

Acknowledged.

+                    msvs_windows_sdk_version or \
+                    _ConfigWindowsTargetPlatformVersion(configuration)
+    if platform_name and msvs_windows_sdk_version:
+      break
+
+  if platform_name == 'ARM':
+    properties[0].append(['WindowsSDKDesktopARMSupport', 'true'])
+  if msvs_windows_sdk_version:
+    properties[0].append(['WindowsTargetPlatformVersion', \

[scottmg, 2016/04/04 22:05:17]

This \ line continuation is unnecessary.

[munyirik, 2016/04/11 20:07:10]

Acknowledged.

+                          str(msvs_windows_sdk_version)])
+
   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'])
@@ skipping 521 matching lines @@
     for dependency in project.dependencies:
       guid = dependency.guid
       project_dir = os.path.split(project.path)[0]
       relative_path = gyp.common.RelativePath(dependency.path, project_dir)
       project_ref = ['ProjectReference',
           {'Include': relative_path},
           ['Project', guid],
           ['ReferenceOutputAssembly', 'false']
           ]
       for config in dependency.spec.get('configurations', {}).itervalues():
+        if config.get('msvs_use_library_dependency_inputs', 0):

[scottmg, 2016/04/04 22:05:17]

What's this? We have ULDI settings already in various places:
https://code.google.com/p/chromium/codesearch#search/&q=UseLibraryDependencyI...

[munyirik, 2016/04/11 20:07:10]

Sorry, I missed putting this in the description. I can only see
UseLibraryDependencyInputs used in one other place (the line below) and it's to
set the value to false. This addition will allow the flag to be set to true.

+          project_ref.append(['UseLibraryDependencyInputs', 'true'])
+          break
         # If it's disabled in any config, turn it off in the reference.
         if config.get('msvs_2010_disable_uldi_when_referenced', 0):
           project_ref.append(['UseLibraryDependencyInputs', 'false'])
           break
       group.append(project_ref)
     references.append(group)
   return references
 
 
 def _GenerateMSBuildProject(project, options, version, generator_flags):
@@ skipping 228 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)