From 099a3368d388f15872be5b6747f5327e782fe23f Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Mon, 25 May 2020 02:53:08 -0400 Subject: [PATCH] bootstrap.bat now forwards to the powershell script --- bootstrap.bat | 41 +---------------------------------------- bootstrap.ps1 | 2 +- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/bootstrap.bat b/bootstrap.bat index 7e4d564..3d5768b 100644 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -1,40 +1 @@ -@echo off -Setlocal EnableDelayedExpansion - -set "vswhere_cmd=third-party\bin\vswhere.exe -nologo -prerelease -latest -property installationPath" - -for /F "tokens=* USEBACKQ" %%A in (`%vswhere_cmd%`) do ( - set ret=%errorlevel% - if %errorlevel% neq 0 ( - echo %%F - echo vswhere returned %ret% - exit /b 1 - ) - - set "installation_path=%%A" - - if "!installation_path!" == "" ( - echo empty installation path - exit /b 1 - ) -) - -set "opts=" -set "opts=%opts% vs/mob.sln" -set "opts=%opts% -m " -set "opts=%opts% -p:Configuration=Release" -set "opts=%opts% -noLogo " -set "opts=%opts% -p:UseMultiToolTask=true" -set "opts=%opts% -p:EnforceProcessCountAcrossBuilds=true" -set "opts=%opts% -clp:ErrorsOnly;Verbosity=minimal" - -set "vcvars=%installation_path%\VC\Auxiliary\Build\vcvarsall.bat" -cmd /c ""%vcvars%" amd64 > NUL && msbuild %opts%" - -if %errorlevel% neq 0 ( - echo build failed - exit /b 1 -) - -copy "build\Release\x64\mob.exe" .\mob.exe > NUL -echo run `mob -d prefix/path build` to start building +@powershell .\bootstrap.ps1 diff --git a/bootstrap.ps1 b/bootstrap.ps1 index af5e469..7215d42 100644 --- a/bootstrap.ps1 +++ b/bootstrap.ps1 @@ -32,4 +32,4 @@ if (! $?) { } Copy-Item "build\Release\x64\mob.exe" ".\mob.exe" -echo "Run ``.\mob -d prefix/path build`` to start building" \ No newline at end of file +echo "run ``.\mob -d prefix/path build`` to start building" \ No newline at end of file