diff options
| author | George Hazan <ghazan@miranda.im> | 2018-10-09 22:59:57 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-10-09 22:59:57 +0300 |
| commit | 063c5fe321ebfc53cae8c0d8902fa928c96dc7c9 (patch) | |
| tree | 70f6b72b399bb1cee21551077e2cc009f1c60161 /build | |
| parent | e4dbf890029e8b44e0cb98da448a6e6a7ab09118 (diff) | |
merge with stable
Diffstat (limited to 'build')
| -rw-r--r-- | build/make_ver_stable.bat | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/build/make_ver_stable.bat b/build/make_ver_stable.bat index 7f920792a6..fd555bc0e2 100644 --- a/build/make_ver_stable.bat +++ b/build/make_ver_stable.bat @@ -12,11 +12,11 @@ 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.%4.%5.%6 if "%OldVer%" == "%1,%2,%3,%4" (goto :eof) for /f "delims=/ tokens=1-3" %%a in ("%DATE:~4%") do ( @@ -27,13 +27,19 @@ for /f "delims=/ tokens=1-3" %%a in ("%DATE:~4%") do ( copy m_version.h.in "%TempFileName%" +if "%6" == "" ( + set FullVersion=%1.%2.%3 +) else ( + set FullVersion=%1.%2.%3.%6 +) + echo #define MIRANDA_VERSION_COREVERSION %1,%2,%3,0 >> "%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 "%FullVersion% 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 "%FullVersion%" >> "%TempFileName%" echo. >> "%TempFileName%" echo #endif // M_VERSION_H__ >> "%TempFileName%" |