Skip to content

Commit 97908ea

Browse files
refackMylesBorins
authored andcommitted
tools: bump vswhere helper to 2.0.0
* enable explicit detection of prerelease VS versions with `set VSWHERE_WITH_PRERELEASE=1` PR-URL: #14557 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Bartosz Sosnowski <[email protected]>
1 parent a4fc432 commit 97908ea

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed
+18-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
:: Copyright 2017 - Refael Ackermann
22
:: Distributed under MIT style license
33
:: See accompanying file LICENSE at https://github.com/node4good/windows-autoconf
4-
:: version: 1.14.0
4+
:: version: 2.0.0
55

66
@if not defined DEBUG_HELPER @ECHO OFF
77
setlocal
8+
if "%~1"=="prerelease" set VSWHERE_WITH_PRERELEASE=1
9+
set "InstallerPath=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
10+
if not exist "%InstallerPath%" set "InstallerPath=%ProgramFiles%\Microsoft Visual Studio\Installer"
11+
if not exist "%InstallerPath%" goto :no-vswhere
12+
:: Manipulate %Path% for easier " handeling
13+
set "Path=%Path%;%InstallerPath%"
14+
where vswhere 2> nul > nul
15+
if errorlevel 1 goto :no-vswhere
816
set VSWHERE_REQ=-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64
917
set VSWHERE_PRP=-property installationPath
1018
set VSWHERE_LMT=-version "[15.0,16.0)"
19+
vswhere -prerelease > nul
20+
if not errorlevel 1 if "%VSWHERE_WITH_PRERELEASE%"=="1" set "VSWHERE_LMT=%VSWHERE_LMT% -prerelease"
1121
SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT%
12-
set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
13-
if not exist "%VSWHERE%" set "VSWHERE=%ProgramFiles%\Microsoft Visual Studio\Installer"
14-
if not exist "%VSWHERE%" exit /B 1
15-
set Path=%Path%;%VSWHERE%
1622
for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
1723
endlocal
1824
set "VCINSTALLDIR=%%i\VC\"
1925
set "VS150COMNTOOLS=%%i\Common7\Tools\"
20-
exit /B 0)
26+
exit /B 0
27+
)
28+
29+
:no-vswhere
30+
endlocal
31+
echo could not find "vswhere"
32+
exit /B 1

0 commit comments

Comments
 (0)