Index: scripts/jenkins/update-code-version.bat =================================================================== diff -u -N -r4ed6512d73cd1b444f83afdefe9a986b6ca9de90 -r8c55893d07674cfbceb5f9b245bf887d8e7079bb --- scripts/jenkins/update-code-version.bat (.../update-code-version.bat) (revision 4ed6512d73cd1b444f83afdefe9a986b6ca9de90) +++ scripts/jenkins/update-code-version.bat (.../update-code-version.bat) (revision 8c55893d07674cfbceb5f9b245bf887d8e7079bb) @@ -9,14 +9,16 @@ rem Detect new version type if "%GIT_TAG_NAME%" == "" ( rem internal build - SET _CHStrVersion=%CHMajorVersion%.%CHMinorVersion%git-%GIT_COMMIT:~-6% + SET _CHStrVersion=%CHMajorVersion%.%CHMinorVersion%-%BUILD_NUMBER%-%GIT_COMMIT:~-6% + SET _CHDetailVersion=1 ) else ( rem tagged build SET _CHStrVersion=%GIT_TAG_NAME% + SET _CHDetailVersion=0 ) echo String version: %_CHStrVersion% -echo Numeric ver: %CHMajorVersion%.%CHMinorVersion%.%BUILD_NUMBER%.0 +echo Numeric ver: %CHMajorVersion%.%CHMinorVersion%.%BUILD_NUMBER%.%_CHDetailVersion% echo Changing version -cscript //NoLogo "%WORKSPACE%\scripts\jenkins\_replace_version.vbs" "%WORKSPACE%\src\common\version.h.template" "%WORKSPACE%\src\common\version.h" %CHMajorVersion% %CHMinorVersion% %BUILD_NUMBER% 0 %_CHStrVersion% +cscript //NoLogo "%WORKSPACE%\scripts\jenkins\_replace_version.vbs" "%WORKSPACE%\src\common\version.h.template" "%WORKSPACE%\src\common\version.h" %CHMajorVersion% %CHMinorVersion% %BUILD_NUMBER% %_CHDetailVersion% %_CHStrVersion%