|
| 1 | +From be50201bc2dd39178c9e880ea6336696bd232373 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Bartosz Sosnowski < [email protected]> |
| 3 | +Date: Mon, 30 Jan 2017 15:33:29 +0100 |
| 4 | +Subject: [PATCH 2/3] Add support for VS2017 to GYP |
| 5 | + |
| 6 | +Adds support for generating solutions and building with Visual Studio 2017 |
| 7 | +--- |
| 8 | + gyp/pylib/gyp/MSVSVersion.py | 33 ++++++++++++++++++++++++++++++++- |
| 9 | + gyp/pylib/gyp/generator/msvs.py | 14 ++++++++++++-- |
| 10 | + 2 files changed, 44 insertions(+), 3 deletions(-) |
| 11 | + |
| 12 | +diff --git a/gyp/pylib/gyp/MSVSVersion.py b/gyp/pylib/gyp/MSVSVersion.py |
| 13 | +index d9bfa68..f6cff66 100644 |
| 14 | +--- a/gyp/pylib/gyp/MSVSVersion.py |
| 15 | ++++ b/gyp/pylib/gyp/MSVSVersion.py |
| 16 | +@@ -84,6 +84,10 @@ class VisualStudioVersion(object): |
| 17 | + # vcvars32, which it can only find if VS??COMNTOOLS is set, which it |
| 18 | + # isn't always. |
| 19 | + if target_arch == 'x86': |
| 20 | ++ if self.short_name == '2017': |
| 21 | ++ return [os.path.normpath( |
| 22 | ++ ps.path.join(self.path, 'Common7/Tools/VsDevCmd.bat')), '/no_logo', |
| 23 | ++ '/arch=x86'] |
| 24 | + if self.short_name >= '2013' and self.short_name[-1] != 'e' and ( |
| 25 | + os.environ.get('PROCESSOR_ARCHITECTURE') == 'AMD64' or |
| 26 | + os.environ.get('PROCESSOR_ARCHITEW6432') == 'AMD64'): |
| 27 | +@@ -96,6 +100,10 @@ class VisualStudioVersion(object): |
| 28 | + os.path.join(self.path, 'Common7/Tools/vsvars32.bat'))] |
| 29 | + else: |
| 30 | + assert target_arch == 'x64' |
| 31 | ++ if self.short_name == '2017': |
| 32 | ++ return [os.path.normpath( |
| 33 | ++ ps.path.join(self.path, 'Common7/Tools/VsDevCmd.bat')), '/no_logo', |
| 34 | ++ '/arch=x64'] |
| 35 | + arg = 'x86_amd64' |
| 36 | + # Use the 64-on-64 compiler if we're not using an express |
| 37 | + # edition and we're running on a 64bit OS. |
| 38 | +@@ -226,6 +234,15 @@ def _CreateVersion(name, path, sdk_based=False): |
| 39 | + if path: |
| 40 | + path = os.path.normpath(path) |
| 41 | + versions = { |
| 42 | ++ '2017': VisualStudioVersion('2017', |
| 43 | ++ 'Visual Studio 2017', |
| 44 | ++ solution_version='12.00', |
| 45 | ++ project_version='14.0', |
| 46 | ++ flat_sln=False, |
| 47 | ++ uses_vcxproj=True, |
| 48 | ++ path=path, |
| 49 | ++ sdk_based=sdk_based, |
| 50 | ++ default_toolset='v141'), |
| 51 | + '2015': VisualStudioVersion('2015', |
| 52 | + 'Visual Studio 2015', |
| 53 | + solution_version='12.00', |
| 54 | +@@ -346,6 +363,7 @@ def _DetectVisualStudioVersions(versions_to_check, force_express): |
| 55 | + 2012(e) - Visual Studio 2012 (11) |
| 56 | + 2013(e) - Visual Studio 2013 (12) |
| 57 | + 2015 - Visual Studio 2015 (14) |
| 58 | ++ 2017 - Visual Studio 2017 (15) |
| 59 | + Where (e) is e for express editions of MSVS and blank otherwise. |
| 60 | + """ |
| 61 | + version_to_year = { |
| 62 | +@@ -355,6 +373,7 @@ def _DetectVisualStudioVersions(versions_to_check, force_express): |
| 63 | + '11.0': '2012', |
| 64 | + '12.0': '2013', |
| 65 | + '14.0': '2015', |
| 66 | ++ '15.0': '2017' |
| 67 | + } |
| 68 | + versions = [] |
| 69 | + for version in versions_to_check: |
| 70 | +@@ -395,6 +414,17 @@ def _DetectVisualStudioVersions(versions_to_check, force_express): |
| 71 | + versions.append(_CreateVersion(version_to_year[version] + 'e', |
| 72 | + os.path.join(path, '..'), sdk_based=True)) |
| 73 | + |
| 74 | ++ if version == '15.0': |
| 75 | ++ # The VC++ 2017 install location needs to be located using COM instead of |
| 76 | ++ # the registry. For details see: |
| 77 | ++ # https://blogs.msdn.microsoft.com/heaths/2016/09/15/changes-to-visual-studio-15-setup/ |
| 78 | ++ # For now we use a hardcoded default with an environment variable |
| 79 | ++ # override. |
| 80 | ++ path = r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional' |
| 81 | ++ path = os.environ.get('vs2017_install', path) |
| 82 | ++ if os.path.exists(path): |
| 83 | ++ versions.append(_CreateVersion('2017', path)) |
| 84 | ++ |
| 85 | + return versions |
| 86 | + |
| 87 | + |
| 88 | +@@ -410,7 +440,7 @@ def SelectVisualStudioVersion(version='auto', allow_fallback=True): |
| 89 | + if version == 'auto': |
| 90 | + version = os.environ.get('GYP_MSVS_VERSION', 'auto') |
| 91 | + version_map = { |
| 92 | +- 'auto': ('14.0', '12.0', '10.0', '9.0', '8.0', '11.0'), |
| 93 | ++ 'auto': ('15.0', '14.0', '12.0', '10.0', '9.0', '8.0', '11.0'), |
| 94 | + '2005': ('8.0',), |
| 95 | + '2005e': ('8.0',), |
| 96 | + '2008': ('9.0',), |
| 97 | +@@ -422,6 +452,7 @@ def SelectVisualStudioVersion(version='auto', allow_fallback=True): |
| 98 | + '2013': ('12.0',), |
| 99 | + '2013e': ('12.0',), |
| 100 | + '2015': ('14.0',), |
| 101 | ++ '2017': ('15.0',), |
| 102 | + } |
| 103 | + override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH') |
| 104 | + if override_path: |
| 105 | +diff --git a/gyp/pylib/gyp/generator/msvs.py b/gyp/pylib/gyp/generator/msvs.py |
| 106 | +index 2ecf964..e8f882c 100644 |
| 107 | +--- a/gyp/pylib/gyp/generator/msvs.py |
| 108 | ++++ b/gyp/pylib/gyp/generator/msvs.py |
| 109 | +@@ -2622,7 +2622,7 @@ def _GetMSBuildProjectConfigurations(configurations): |
| 110 | + return [group] |
| 111 | + |
| 112 | + |
| 113 | +-def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name): |
| 114 | ++def _GetMSBuildGlobalProperties(spec, version, guid, gyp_file_name): |
| 115 | + namespace = os.path.splitext(gyp_file_name)[0] |
| 116 | + properties = [ |
| 117 | + ['PropertyGroup', {'Label': 'Globals'}, |
| 118 | +@@ -2713,6 +2713,12 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name): |
| 119 | + if platform_name and msvs_windows_sdk_version: |
| 120 | + break |
| 121 | + |
| 122 | ++ if msvs_windows_sdk_version == None and version.ShortName() == '2017': |
| 123 | ++ vs2017_sdk = '10.0.14393.0' |
| 124 | ++ vs2017_sdk = os.environ.get('vs2017_sdk', vs2017_sdk) |
| 125 | ++ if vs2017_sdk: |
| 126 | ++ msvs_windows_sdk_version = vs2017_sdk |
| 127 | ++ |
| 128 | + if platform_name == 'ARM': |
| 129 | + properties[0].append(['WindowsSDKDesktopARMSupport', 'true']) |
| 130 | + if msvs_windows_sdk_version: |
| 131 | +@@ -3301,7 +3310,8 @@ def _GenerateMSBuildProject(project, options, version, generator_flags): |
| 132 | + }] |
| 133 | + |
| 134 | + content += _GetMSBuildProjectConfigurations(configurations) |
| 135 | +- content += _GetMSBuildGlobalProperties(spec, project.guid, project_file_name) |
| 136 | ++ content += _GetMSBuildGlobalProperties(spec, version, project.guid, |
| 137 | ++ project_file_name) |
| 138 | + content += import_default_section |
| 139 | + content += _GetMSBuildConfigurationDetails(spec, project.build_file) |
| 140 | + if spec.get('msvs_enable_winphone'): |
| 141 | +-- |
| 142 | +2.11.0.windows.1 |
| 143 | + |
0 commit comments