diff options
| author | Baruch Odem <baruchiro@gmail.com> | 2020-11-08 13:23:04 +0200 |
|---|---|---|
| committer | Beth Griggs <bgriggs@redhat.com> | 2020-12-15 20:15:25 +0000 |
| commit | c4c854162182b8c390080191549232a5de70f317 (patch) | |
| tree | 6c2527f75d073af7e885d273291836c2aa6d6b64 | |
| parent | 713d1ebe75e392ccf3c5a8af2bb2ef06dd814957 (diff) | |
| download | node-new-c4c854162182b8c390080191549232a5de70f317.tar.gz | |
win,build,tools: support VS prerelease
PR-URL: https://github.com/nodejs/node/pull/36033
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
| -rw-r--r-- | tools/msvs/vswhere_usability_wrapper.cmd | 2 | ||||
| -rw-r--r-- | vcbuild.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/msvs/vswhere_usability_wrapper.cmd b/tools/msvs/vswhere_usability_wrapper.cmd index 0c7cac1e4c..45ca5b2164 100644 --- a/tools/msvs/vswhere_usability_wrapper.cmd +++ b/tools/msvs/vswhere_usability_wrapper.cmd @@ -5,7 +5,7 @@ @if not defined DEBUG_HELPER @ECHO OFF setlocal -if "%~1"=="prerelease" set VSWHERE_WITH_PRERELEASE=1 +if "%~2"=="prerelease" set VSWHERE_WITH_PRERELEASE=1 set "InstallerPath=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer" if not exist "%InstallerPath%" set "InstallerPath=%ProgramFiles%\Microsoft Visual Studio\Installer" if not exist "%InstallerPath%" goto :no-vswhere diff --git a/vcbuild.bat b/vcbuild.bat index 7b730523dc..4316658bb4 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -249,7 +249,7 @@ echo Looking for Visual Studio 2019 @rem cleared first as vswhere_usability_wrapper.cmd doesn't when it fails to @rem detect the version searched for if not defined target_env set "VCINSTALLDIR=" -call tools\msvs\vswhere_usability_wrapper.cmd "[16.0,17.0)" +call tools\msvs\vswhere_usability_wrapper.cmd "[16.0,17.0)" "prerelease" if "_%VCINSTALLDIR%_" == "__" goto vs-set-2017 set "WIXSDKDIR=%WIX%\SDK\VS2017" if defined msi ( |