mantis 8512: add proposed detection of VS2019 to runprebuild (both this and vs2019 untested by me

0.9.1.0-post-fixes
UbitUmarov 2019-04-04 15:07:15 +01:00
parent 15b6d8c147
commit 42414bfa55
1 changed files with 8 additions and 3 deletions

View File

@ -5,22 +5,27 @@ bin\Prebuild.exe /target vs2015
setlocal ENABLEEXTENSIONS setlocal ENABLEEXTENSIONS
set VALUE_NAME=MSBuildToolsPath set VALUE_NAME=MSBuildToolsPath
rem Try to find VS2019
for %%e in (Enterprise Professional Community) do (
if exist "%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild.exe" (
set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\"
goto :found
)
)
rem try find vs2017 rem try find vs2017
if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMS=%ProgramFiles% if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMS=%ProgramFiles%
if defined ProgramFiles(x86) set PROGRAMS=%ProgramFiles(x86)% if defined ProgramFiles(x86) set PROGRAMS=%ProgramFiles(x86)%
for %%e in (Enterprise Professional Community) do ( for %%e in (Enterprise Professional Community) do (
if exist "%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\MSBuild.exe" ( if exist "%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\MSBuild.exe" (
set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\" set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\"
goto :found goto :found
) )
) )
rem We have to use grep or find to locate the correct line, because reg query spits rem We have to use grep or find to locate the correct line, because reg query spits
rem out 4 lines before Windows 7 but 2 lines after Windows 7. rem out 4 lines before Windows 7 but 2 lines after Windows 7.
rem We use grep if it's on the path; otherwise we use the built-in find command rem We use grep if it's on the path; otherwise we use the built-in find command