From 691b1c649ab54ebfbb66eb3cba707b132b1134a8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 23 Feb 2019 15:29:40 +0300 Subject: fix for calculating proper version of stable build --- tools/build_scripts/zz_zRebuildUploadStable.bat | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat index d7b2996db4..9e911f7504 100644 --- a/tools/build_scripts/zz_zRebuildUploadStable.bat +++ b/tools/build_scripts/zz_zRebuildUploadStable.bat @@ -4,7 +4,15 @@ pause set comp=bin15 -for /F "tokens=1,2,3 delims= " %%i in (build/build.no.stable) do set Branch=%%i_%%j_%%k +for /F "tokens=1,2,3,4 delims= " %%i in (build/build.no.stable) do ( + if "%%l" == "" ( + set Branch=%%i_%%j_%%k + set MirVer=%%i.%%j.%%k + ) else ( + set Branch=%%i_%%j_%%k_%%l + set MirVer=%%i.%%j.%%k.%%l + ) +) call git_update.bat %Branch% set GIT_STATUS=%ERRORLEVEL% @@ -18,10 +26,9 @@ del /F /Q version.txt pushd build copy build.no.stable build.no copy make_ver_stable.bat make_ver.bat -for /F "tokens=1,2,3,4 delims= " %%i in (build.no.stable) do set MirVer=%%i.%%j.%%k.%%l popd -echo v%MirVer% > version.txt +echo Building v%MirVer% > version.txt start /min /wait z1_ReBuild_Full.bat 32 %comp% -- cgit v1.2.3