From f9e9f87fe527ef131e10518ed19b5cd071299c9b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 8 Jun 2018 16:59:26 +0300 Subject: sub-versions for stable builds --- build/build.no.stable | 2 +- build/make_ver_stable.bat | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/build.no.stable b/build/build.no.stable index c90470bb36..0987025c39 100644 --- a/build/build.no.stable +++ b/build/build.no.stable @@ -1 +1 @@ -0 95 8 \ No newline at end of file +0 95 8 1 \ No newline at end of file diff --git a/build/make_ver_stable.bat b/build/make_ver_stable.bat index f94f659717..86c24836c4 100644 --- a/build/make_ver_stable.bat +++ b/build/make_ver_stable.bat @@ -12,11 +12,12 @@ if "%Revision%" == "" (set Revision=0) REM Fix trailing 'M', when the working copy contains modifications if "%Revision:~-1%" == "M" (set Revision=%Revision:~0,-1%) -for /F "tokens=1,2,3 delims= " %%i in (build.no.stable) do call :WriteVer %%i %%j %%k %Revision% %Hash% +for /F "tokens=1,2,3,4 delims= " %%i in (build.no.stable) do call :WriteVer %%i %%j %%k %Revision% %Hash% %%l goto :eof :WriteVer -echo %1.%2.%3.%4.%5 +echo %1.%2.%3.%6 build %4 (%5) + if "%OldVer%" == "%1,%2,%3,%4" (goto :eof) for /f "delims=/ tokens=1-3" %%a in ("%DATE:~4%") do ( @@ -29,10 +30,10 @@ copy m_version.h.in "%TempFileName%" echo #define MIRANDA_VERSION_FILEVERSION %1,%2,%3,%4 >> "%TempFileName%" echo #define MIRANDA_VERSION_STRING "%1.%2.%3.%4" >> "%TempFileName%" -echo #define MIRANDA_VERSION_DISPLAY "%1.%2.%3 build #%4 (%5)" >> "%TempFileName%" +echo #define MIRANDA_VERSION_DISPLAY "%1.%2.%3.%6 build #%4 (%5)" >> "%TempFileName%" echo #define MIRANDA_VERSION_DWORD MIRANDA_MAKE_VERSION(%1, %2, %3, %4) >> "%TempFileName%" echo #define MIRANDA_VERSION_CORE MIRANDA_MAKE_VERSION(%1, %2, %3, 0) >> "%TempFileName%" -echo #define MIRANDA_VERSION_CORE_STRING "%1.%2.%3" >> "%TempFileName%" +echo #define MIRANDA_VERSION_CORE_STRING "%1.%2.%3.%6" >> "%TempFileName%" echo. >> "%TempFileName%" echo #endif // M_VERSION_H__ >> "%TempFileName%" -- cgit v1.2.3