feat: Better indicate release and development versions via version suffix (#1850)

* Add codename to version string and to bootloader title.

* Use EDGETX_VERSION_SUFFIX instead of CODENAME

* use "dev" instead of "merge" and "custom" instead of "SB".
Changed to lower case for "nightly" and "release".

* Show TEST BUILD warning screen for all non release builds.

* Improved logic

* Removed TEST_BUILD_WARNING, reverted to "merge" and changed to "selfbuild".
This commit is contained in:
Peter Feerick
2022-04-24 14:26:56 +10:00
parent f5b1b53294
commit 2a3fc748bb
6 changed files with 28 additions and 32 deletions
+7 -1
View File
@@ -6,7 +6,13 @@ set(VERSION_MAJOR "2")
set(VERSION_MINOR "8")
set(VERSION_REVISION "0")
set(CODENAME "dev")
set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
if(DEFINED ENV{EDGETX_VERSION_SUFFIX})
set(VERSION_SUFFIX "-$ENV{EDGETX_VERSION_SUFFIX}")
else()
set(VERSION_SUFFIX "-selfbuild") # If not defined, set suffix to selfbuild
endif()
set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})