fix: build.bat

MiroKaku · Jun 17, 2022 · d45ca46 · d45ca46
1 parent 5a877f6
commit d45ca46
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/.github/workflows/build.bat b/.github/workflows/build.bat
@@ -1,21 +1,29 @@
 @echo off
+setlocal enabledelayedexpansion
+
 pushd "%~dp0"
 
+set msbuild="%PROGRAMFILES(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe"
+
+for /f "usebackq tokens=*" %%i in (`vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe`) do (
+  set msbuild="%%i"
+)
+
 if exist bin rd /s /q bin
 if exist lib rd /s /q lib
 if exist ucxxrt rd /s /q ucxxrt
 
-"%PROGRAMFILES(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Release /p:Platform=x86 ..\..\ucxxrt.sln -t:ucxxrt
-"%PROGRAMFILES(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Debug   /p:Platform=x86 ..\..\ucxxrt.sln -t:ucxxrt
+%msbuild% -p:Configuration=Debug   -p:Platform=x86 ..\..\ucxxrt.sln -t:ucxxrt
+%msbuild% -p:Configuration=Release -p:Platform=x86 ..\..\ucxxrt.sln -t:ucxxrt
 
-"%PROGRAMFILES(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Release /p:Platform=x64 ..\..\ucxxrt.sln -t:ucxxrt
-"%PROGRAMFILES(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Debug   /p:Platform=x64 ..\..\ucxxrt.sln -t:ucxxrt
+%msbuild% -p:Configuration=Debug   -p:Platform=x64 ..\..\ucxxrt.sln -t:ucxxrt
+%msbuild% -p:Configuration=Release -p:Platform=x64 ..\..\ucxxrt.sln -t:ucxxrt
 
-"%PROGRAMFILES(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Release /p:Platform=ARM ..\..\ucxxrt.sln -t:ucxxrt
-"%PROGRAMFILES(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Debug   /p:Platform=ARM ..\..\ucxxrt.sln -t:ucxxrt
+%msbuild% -p:Configuration=Debug   -p:Platform=ARM ..\..\ucxxrt.sln -t:ucxxrt
+%msbuild% -p:Configuration=Release -p:Platform=ARM ..\..\ucxxrt.sln -t:ucxxrt
 
-"%PROGRAMFILES(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Release /p:Platform=ARM64 ..\..\ucxxrt.sln -t:ucxxrt
-"%PROGRAMFILES(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe" /p:Configuration=Debug   /p:Platform=ARM64 ..\..\ucxxrt.sln -t:ucxxrt
+%msbuild% -p:Configuration=Debug   -p:Platform=ARM64 ..\..\ucxxrt.sln -t:ucxxrt
+%msbuild% -p:Configuration=Release -p:Platform=ARM64 ..\..\ucxxrt.sln -t:ucxxrt
 
 :exit
 popd