add 0004 patch for 2017 compat

Author: refack

0004-Add-support-for-VS2017-to-GYP.patch

@@ -0,0 +1,145 @@
+From 07277334521c3194b4415fad63ace78c13c42e34 Mon Sep 17 00:00:00 2001
+From: Bartosz Sosnowski <bartosz@janeasystems.com>
+Date: Mon, 30 Jan 2017 15:33:29 +0100
+Subject: [PATCH] Add support for VS2017 to GYP
+
+Adds support for generating solutions and building with Visual Studio 2017
+---
+ gyp/pylib/gyp/MSVSVersion.py    | 31 ++++++++++++++++++++++++++++---
+ gyp/pylib/gyp/generator/msvs.py | 10 ++++++++--
+ 2 files changed, 36 insertions(+), 5 deletions(-)
+
+diff --git a/gyp/pylib/gyp/MSVSVersion.py b/gyp/pylib/gyp/MSVSVersion.py
+index edaf6ee..e34ebc5 100644
+--- a/gyp/pylib/gyp/MSVSVersion.py
++++ b/gyp/pylib/gyp/MSVSVersion.py
+@@ -86,6 +86,10 @@ class VisualStudioVersion(object):
+       # vcvars32, which it can only find if VS??COMNTOOLS is set, which it
+       # isn't always.
+       if target_arch == 'x86':
++        if self.short_name == '2017':
++          return [os.path.normpath(
++            ps.path.join(self.path, 'Common7/Tools/VsDevCmd.bat')), '/no_logo',
++            '/arch=x86']
+         if self.short_name >= '2013' and self.short_name[-1] != 'e' and (
+             os.environ.get('PROCESSOR_ARCHITECTURE') == 'AMD64' or
+             os.environ.get('PROCESSOR_ARCHITEW6432') == 'AMD64'):
+@@ -98,6 +102,10 @@ class VisualStudioVersion(object):
+           os.path.join(self.path, 'Common7/Tools/vsvars32.bat'))]
+       else:
+         assert target_arch == 'x64'
++        if self.short_name == '2017':
++          return [os.path.normpath(
++            ps.path.join(self.path, 'Common7/Tools/VsDevCmd.bat')), '/no_logo',
++            '/arch=x64']
+         arg = 'x86_amd64'
+         # Use the 64-on-64 compiler if we're not using an express
+         # edition and we're running on a 64bit OS.
+@@ -236,6 +244,15 @@ def _CreateVersion(name, path, sdk_based=False):
+   if path:
+     path = os.path.normpath(path)
+   versions = {
++      '2017': VisualStudioVersion('2017',
++                                  'Visual Studio 2017',
++                                  solution_version='12.00',
++                                  project_version='14.0',
++                                  flat_sln=False,
++                                  uses_vcxproj=True,
++                                  path=path,
++                                  sdk_based=sdk_based,
++                                  default_toolset='v141'),
+       '2015': VisualStudioVersion('2015',
+                                   'Visual Studio 2015',
+                                   solution_version='12.00',
+@@ -356,6 +373,7 @@ def _DetectVisualStudioVersions(versions_to_check, force_express):
+       2012(e) - Visual Studio 2012 (11)
+       2013(e) - Visual Studio 2013 (12)
+       2015    - Visual Studio 2015 (14)
++      2017    - Visual Studio 2017 (15)
+     Where (e) is e for express editions of MSVS and blank otherwise.
+   """
+   version_to_year = {
+@@ -365,6 +383,7 @@ def _DetectVisualStudioVersions(versions_to_check, force_express):
+       '11.0': '2012',
+       '12.0': '2013',
+       '14.0': '2015',
++      '15.0': '2017'
+   }
+   versions = []
+   for version in versions_to_check:
+@@ -395,13 +414,18 @@ def _DetectVisualStudioVersions(versions_to_check, force_express):
+ 
+     # The old method above does not work when only SDK is installed.
+     keys = [r'HKLM\Software\Microsoft\VisualStudio\SxS\VC7',
+-            r'HKLM\Software\Wow6432Node\Microsoft\VisualStudio\SxS\VC7']
++            r'HKLM\Software\Wow6432Node\Microsoft\VisualStudio\SxS\VC7',
++            r'HKLM\Software\Microsoft\VisualStudio\SxS\VS7',
++            r'HKLM\Software\Wow6432Node\Microsoft\VisualStudio\SxS\VS7']
+     for index in range(len(keys)):
+       path = _RegistryGetValue(keys[index], version)
+       if not path:
+         continue
+       path = _ConvertToCygpath(path)
+-      if version != '14.0':  # There is no Express edition for 2015.
++      if version == '15.0':
++          if os.path.exists(path):
++              versions.append(_CreateVersion('2017', path))
++      elif version != '14.0':  # There is no Express edition for 2015.
+         versions.append(_CreateVersion(version_to_year[version] + 'e',
+             os.path.join(path, '..'), sdk_based=True))
+ 
+@@ -420,7 +444,7 @@ def SelectVisualStudioVersion(version='auto', allow_fallback=True):
+   if version == 'auto':
+     version = os.environ.get('GYP_MSVS_VERSION', 'auto')
+   version_map = {
+-    'auto': ('14.0', '12.0', '10.0', '9.0', '8.0', '11.0'),
++    'auto': ('15.0', '14.0', '12.0', '10.0', '9.0', '8.0', '11.0'),
+     '2005': ('8.0',),
+     '2005e': ('8.0',),
+     '2008': ('9.0',),
+@@ -432,6 +456,7 @@ def SelectVisualStudioVersion(version='auto', allow_fallback=True):
+     '2013': ('12.0',),
+     '2013e': ('12.0',),
+     '2015': ('14.0',),
++    '2017': ('15.0',),
+   }
+   override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH')
+   if override_path:
+diff --git a/gyp/pylib/gyp/generator/msvs.py b/gyp/pylib/gyp/generator/msvs.py
+index 25eb58e..d6a8ec7 100644
+--- a/gyp/pylib/gyp/generator/msvs.py
++++ b/gyp/pylib/gyp/generator/msvs.py
+@@ -2664,7 +2664,7 @@ def _GetMSBuildProjectConfigurations(configurations):
+   return [group]
+ 
+ 
+-def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
++def _GetMSBuildGlobalProperties(spec, version, guid, gyp_file_name):
+   namespace = os.path.splitext(gyp_file_name)[0]
+   properties = [
+       ['PropertyGroup', {'Label': 'Globals'},
+@@ -2712,6 +2712,11 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
+                     _ConfigWindowsTargetPlatformVersion(configuration))
+     if platform_name and msvs_windows_sdk_version:
+       break
++  if msvs_windows_sdk_version == None and version.ShortName() == '2017':
++    vs2017_sdk = '10.0.14393.0'
++    vs2017_sdk = os.environ.get('vs2017_sdk', vs2017_sdk)
++    if vs2017_sdk:
++      msvs_windows_sdk_version = vs2017_sdk
+ 
+   if platform_name == 'ARM':
+     properties[0].append(['WindowsSDKDesktopARMSupport', 'true'])
+@@ -3366,7 +3371,8 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
+       }]
+ 
+   content += _GetMSBuildProjectConfigurations(configurations)
+-  content += _GetMSBuildGlobalProperties(spec, project.guid, project_file_name)
++  content += _GetMSBuildGlobalProperties(spec, version, project.guid,
++                                         project_file_name)
+   content += import_default_section
+   content += _GetMSBuildConfigurationDetails(spec, project.build_file)
+   if spec.get('msvs_enable_winphone'):
+-- 
+2.11.0.windows.1
+