From 46defa5d318a71d682918b039170dd9b89bbe313 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 27 Nov 2018 13:02:12 +0000 Subject: [PATCH] change runprebuild.bat to not create compile.bat if msbuild for vs2017 or vs2017 not found --- runprebuild.bat | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/runprebuild.bat b/runprebuild.bat index 78ac8dca64..f366175135 100755 --- a/runprebuild.bat +++ b/runprebuild.bat @@ -33,19 +33,22 @@ if defined FOUNDGREP ( set FINDCMD=find ) - -for %%v in (14.0, 12.0, 4.0) do ( - FOR /F "usebackq tokens=1-3" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\%%v" /v %VALUE_NAME% 2^>nul ^| %FINDCMD% "%VALUE_NAME%"`) DO ( - set ValueValue=%%C - goto :found - ) +rem try vs2015 +FOR /F "usebackq tokens=1-3" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14" /v %VALUE_NAME% 2^>nul ^| %FINDCMD% "%VALUE_NAME%"`) DO ( + set ValueValue=%%C + goto :found ) -@echo %KEY_NAME%\%VALUE_NAME% not found. +@echo msbuild for at least VS2015 not found, please install a (Community) edition of VS2017 or VS2015 @echo Not creating compile.bat -exit +if exist "compile.bat" ( + del compile.bat + ) +goto :done :found @echo Found msbuild at %ValueValue% @echo Creating compile.bat @echo %ValueValue%\msbuild opensim.sln > compile.bat + +:done \ No newline at end of file