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".

tools/build-companion-nightly-win32.sh

@@ -39,6 +39,8 @@ fi
 
 if [ "$3" != "" ]; then
   COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
+else
+  COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=nightly"
 fi
 
 rm -rf build

tools/build-companion-nightly.sh

@@ -39,6 +39,8 @@ fi
 
 if [ "$3" != "" ]; then
   COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
+else
+  COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=nightly"
 fi
 
 rm -rf build

tools/build-companion-release.sh

@@ -37,24 +37,14 @@ fi
 
 if [ "$3" != "" ]; then
   COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
+else
+  COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=release"
 fi
 
 rm -rf build
 mkdir build
 cd build
 
-cmake ${COMMON_OPTIONS} -DPCB=AR9X ${SRCDIR}
-make -j${JOBS} libsimulator
-rm CMakeCache.txt
-
-cmake ${COMMON_OPTIONS} -DPCB=SKY9X ${SRCDIR}
-make -j${JOBS} libsimulator
-rm CMakeCache.txt
-
-cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR}
-make -j${JOBS} libsimulator
-rm CMakeCache.txt
-
 cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR}
 make -j${JOBS} libsimulator
 rm CMakeCache.txt

tools/build-gh.sh

@@ -48,6 +48,16 @@ fi
 
 : ${SRCDIR:=$(dirname "$(pwd)/$0")/..}
 
+gh_tag=${GITHUB_REF##*/}
+gh_branch=$(git rev-parse --abbrev-ref HEAD)
+
+if [[ -z $gh_tag ]];
+then
+  export EDGETX_VERSION_SUFFIX=$gh_branch
+else
+  export EDGETX_VERSION_SUFFIX=$gh_tag
+fi
+
 : ${BUILD_TYPE:=Release}
 : ${COMMON_OPTIONS:="-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_RULE_MESSAGES=OFF -Wno-dev "}
 : ${EXTRA_OPTIONS:="$EXTRA_OPTIONS"}