piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Further tweaks to version string (#1895)

Browse Source 
* fix: Only define SUFFIX if PR or BRANCH build
Also, only define `VERSION_TAG` if VERSION_TAG exists.

* fix: Omit GIT SHA for colorlcd also if a tagged build
This commit is contained in:
Peter Feerick
2022-04-26 10:32:01 +10:00
committed by GitHub
parent 0514ed2b99
commit 3493d69c5b
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/stamp.cpp
+1 -1
View File
@@ -49,7 +49,7 @@
const char vers_stamp[] = "VERS" TAB ": Factory firmware (" GIT_STR ")";
#else
#if defined(VERSION_TAG)
const char vers_stamp[] = "VERS" TAB ": " VERSION_TAG DISPLAY_VERSION " (" GIT_STR ")";
const char vers_stamp[] = "VERS" TAB ": " VERSION_TAG DISPLAY_VERSION;
#else
const char vers_stamp[] = "VERS" TAB ": " VERSION "-" VERSION_SUFFIX DISPLAY_VERSION " (" GIT_STR ")";
#endif
radio/src/stamp.h.in
+1 -3
View File
@@ -2,9 +2,7 @@
#define TIME "@TIME@"
#define VERSION "@VERSION@"
#define VERSION_SUFFIX "@VERSION_SUFFIX@"
#if defined(VERSION_TAG)
#define VERSION_TAG "@VERSION_TAG@"
#endif
#cmakedefine VERSION_TAG "@VERSION_TAG@"
#define CODENAME "@CODENAME@"
#define VERSION_MAJOR @VERSION_MAJOR@