Enabling /ZW (CompileAsWinRT) option for msvs

sgraham · sgraham · commit 02b145a1a4f4 · 2016-05-04T11:19:03.000-07:00
This change enables someone using gyp to specify the CompileAsWinRT option (i.e. use the /ZW compiler flag). The change also includes: - Test for CompileAsWinRT (change in test/win/compiler-flags) - Enabling Visual Studio 2015 to be targeted by tests (change in testgyp.py) - Detecting Windows SDK version if 'msvs_windows_sdk_version' is used (change in msvs.py) - Enabling arm target architecture to be specified (change in msvs.py) Patch from munyirik@microsoft.com. R=scottmg@chromium.org Review URL: https://codereview.chromium.org/1946883002 .
diff --git a/pylib/gyp/MSVSSettings.py b/pylib/gyp/MSVSSettings.py
@@ -592,6 +592,7 @@ def _ValidateSettings(validators, settings, stderr):
 _Same(_compile, 'UseFullPaths', _boolean)  # /FC
 _Same(_compile, 'WholeProgramOptimization', _boolean)  # /GL
 _Same(_compile, 'XMLDocumentationFileName', _file_name)
+_Same(_compile, 'CompileAsWinRT', _boolean)  # /ZW
 
 _Same(_compile, 'AssemblerOutput',
       _Enumeration(['NoListing',
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py
@@ -257,6 +257,8 @@ def _ToolSetOrAppend(tools, tool_name, setting, value, only_if_unset=False):
   if not tools.get(tool_name):
     tools[tool_name] = dict()
   tool = tools[tool_name]
+  if 'CompileAsWinRT' == setting:
+    return
   if tool.get(setting):
     if only_if_unset: return
     if type(tool[setting]) == list and type(value) == list:
@@ -286,6 +288,21 @@ def _ConfigFullName(config_name, config_data):
   return '%s|%s' % (_ConfigBaseName(config_name, platform_name), platform_name)
 
 
+def _ConfigWindowsTargetPlatformVersion(config_data):
+  ver = config_data.get('msvs_windows_sdk_version')
+
+  for key in [r'HKLM\Software\Microsoft\Microsoft SDKs\Windows\%s',
+              r'HKLM\Software\Wow6432Node\Microsoft\Microsoft SDKs\Windows\%s']:
+    sdk_dir = MSVSVersion._RegistryGetValue(key % ver, 'InstallationFolder')
+    if not sdk_dir:
+      continue
+    version = MSVSVersion._RegistryGetValue(key % ver, 'ProductVersion') or ''
+    # Find a matching entry in sdk_dir\include.
+    names = sorted([x for x in os.listdir(r'%s\include' % sdk_dir)
+                    if x.startswith(version)], reverse=True)
+    return names[0]
+
+
 def _BuildCommandLineForRuleRaw(spec, cmd, cygwin_shell, has_input_path,
                                 quote_cmd, do_setup_env):
 
@@ -2676,6 +2693,21 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
     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 = (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',
+                          str(msvs_windows_sdk_version)])
+
   return properties
 
 def _GetMSBuildConfigurationDetails(spec, build_file):
diff --git a/test/lib/TestGyp.py b/test/lib/TestGyp.py
@@ -706,6 +706,7 @@ def FindVisualStudioInstallation():
                     for drive in range(ord('C'), ord('Z') + 1)
                     for suffix in ['', ' (x86)']]
   possible_paths = {
+      '2015': r'Microsoft Visual Studio 14.0\Common7\IDE\devenv.com',
       '2013': r'Microsoft Visual Studio 12.0\Common7\IDE\devenv.com',
       '2012': r'Microsoft Visual Studio 11.0\Common7\IDE\devenv.com',
       '2010': r'Microsoft Visual Studio 10.0\Common7\IDE\devenv.com',
diff --git a/test/win/compiler-flags/compile-as-winrt.cc b/test/win/compiler-flags/compile-as-winrt.cc
@@ -0,0 +1,12 @@
+// Copyright (c) 2016 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.
+
+using namespace Platform;
+
+int main() {
+  wchar_t msg[] = L"Test";
+  String^ str1 = ref new String(msg);
+  auto str2 = String::Concat(str1, " Concat");
+  return 0;
+}
diff --git a/test/win/compiler-flags/compile-as-winrt.gyp b/test/win/compiler-flags/compile-as-winrt.gyp
@@ -0,0 +1,20 @@
+# Copyright (c) 2016 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'test-compile-as-winrt',
+      'type': 'executable',
+      'msvs_windows_sdk_version': 'v10.0',
+      'msvs_settings': {
+        'VCCLCompilerTool': {
+          'AdditionalUsingDirectories': ['$(VCInstallDir)vcpackages;$(WindowsSdkDir)UnionMetadata;%(AdditionalUsingDirectories)'],
+          'CompileAsWinRT': 'true'
+        }
+      },
+      'sources': ['compile-as-winrt.cc']
+    }
+  ]
+}
diff --git a/test/win/gyptest-cl-compile-as-winrt.py b/test/win/gyptest-cl-compile-as-winrt.py
@@ -0,0 +1,20 @@
+# Copyright (c) 2016 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 TestGyp
+
+import os
+import sys
+
+if (sys.platform == 'win32' and
+    int(os.environ.get('GYP_MSVS_VERSION', 0)) >= 2015):
+  test = TestGyp.TestGyp(formats=['msvs'])
+
+  CHDIR = 'compiler-flags'
+
+  test.run_gyp('compile-as-winrt.gyp', chdir=CHDIR)
+
+  test.build('compile-as-winrt.gyp', 'test-compile-as-winrt', chdir=CHDIR)
+
+  test.pass_test()
