From fa18c51871b0e0d7d78951416848b6b766954c6f Mon Sep 17 00:00:00 2001 From: Geoff McLane Date: Wed, 2 Aug 2017 20:29:09 +0200 Subject: [PATCH] Add a 'next' branch check to Win64/build-me.bat No code change, so no version bump for this... --- build/win64/build-me.bat | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/build/win64/build-me.bat b/build/win64/build-me.bat index 2e9ba9f..4cb8374 100644 --- a/build/win64/build-me.bat +++ b/build/win64/build-me.bat @@ -1,4 +1,6 @@ @setlocal +@REM 20170702 - Check branch +@set TMPBR=next @REM 20161002 - Change to msvc140 build @set VCVERS=14 @set GENERATOR=Visual Studio %VCVERS% Win64 @@ -62,6 +64,9 @@ :GOTCMD @call chkmsvc %TMPPRJ% +@call chkbranch %TMPBR% +@if ERRORLEVEL 1 goto BADBR +:GOTBR @echo Begin %DATE% %TIME%, output to %TMPLOG% @echo Begin %DATE% %TIME% >> %TMPLOG% @@ -176,6 +181,16 @@ @if ERRORLEVEL 1 goto ERR33 @goto DNREL +:BADBR +@call git checkout %TMPBR% +@call chkbranch %TMPBR% +@if ERRORLEVEL 1 goto BADBR2 +@goto GOTBR +:BADBR2 +@call shwbranch +@echo Not on correct branch %TMPBR% +@goto ISERR + :ISERR @endlocal @exit /b 1