build,win,msi: support WiX with VS2017

PR-URL: #17101 Reviewed-By: Nikolai Vavilov <[email protected]>

Author: joaocgreis

BUILDING.md

@@ -209,6 +209,8 @@ Prerequisites:
 * Basic Unix tools required for some tests,
 [Git for Windows](http://git-scm.com/download/win) includes Git Bash
  and tools which can be included in the global `PATH`.
+***Optional** (to build the MSI): the [WiX Toolset v3.11](http://wixtoolset.org/releases/)
+ and the [Wix Toolset Visual Studio 2017 Extension](https://marketplace.visualstudio.com/items?itemName=RobMensching.WixToolsetVisualStudio2017Extension).
 
 If the path to your build directory contains a space, the build will likely fail.
 

vcbuild.bat

@@ -192,12 +192,24 @@ if %target_arch%==x64 if %msvs_host_arch%==amd64 set vcvarsall_arg=amd64
 :vs-set-2017
 ifdefined target_env if"%target_env%"NEQ"vs2017"goto vs-set-2015
 echo Looking for Visual Studio 2017
+call tools\msvs\vswhere_usability_wrapper.cmd
+if"_%VCINSTALLDIR%_"=="__"goto vs-set-2015
+ifdefined msi (
+echo Looking for WiX installation for Visual Studio 2017...
+ifnotexist"%WIX%\SDK\VS2017" (
+echo Failed to find WiX install for Visual Studio 2017
+echo VS2017 support for WiX is only present starting at version 3.11
+goto vs-set-2015
+ )
+ifnotexist"%VCINSTALLDIR%\..\MSBuild\Microsoft\WiX" (
+echo Failed to find the Wix Toolset Visual Studio 2017 Extension
+goto vs-set-2015
+ )
+)
 @rem check if VS2017 is already setup, and for the requested arch
 if"_%VisualStudioVersion%_"=="_15.0_"if"_%VSCMD_ARG_TGT_ARCH%_"=="_%target_arch%_"goto found_vs2017
 @rem need to clear VSINSTALLDIR for vcvarsall to work as expected
 set"VSINSTALLDIR="
-call tools\msvs\vswhere_usability_wrapper.cmd
-if"_%VCINSTALLDIR%_"=="__"goto vs-set-2015
 @rem prevent VsDevCmd.bat from changing the current working directory
 set"VSCMD_START_DIR=%CD%"
 setvcvars_call="%VCINSTALLDIR%\Auxiliary\Build\vcvarsall.bat"%vcvarsall_arg%
@@ -354,7 +366,9 @@ if not defined msi goto run
 
 :msibuild
 echo Building node-v%FULLVERSION%-%target_arch%.msi
-msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build /p:PlatformToolset=%PLATFORM_TOOLSET% /p:GypMsvsVersion=%GYP_MSVS_VERSION% /p:Configuration=%config% /p:Platform=%target_arch% /p:NodeVersion=%NODE_VERSION% /p:FullVersion=%FULLVERSION% /p:DistTypeDir=%DISTTYPEDIR%%noetw_msi_arg%%noperfctr_msi_arg% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
+set"msbsdk="
+ifdefined WindowsSDKVersion set"msbsdk=/p:WindowsTargetPlatformVersion=%WindowsSDKVersion:~0,-1%"
+msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build %msbsdk% /p:PlatformToolset=%PLATFORM_TOOLSET% /p:GypMsvsVersion=%GYP_MSVS_VERSION% /p:Configuration=%config% /p:Platform=%target_arch% /p:NodeVersion=%NODE_VERSION% /p:FullVersion=%FULLVERSION% /p:DistTypeDir=%DISTTYPEDIR%%noetw_msi_arg%%noperfctr_msi_arg% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
 iferrorlevel1gotoexit
 
 ifnotdefined sign goto upload