commit a306397818d2644e5b2a5222bf5cc3a4a81da0d4
author Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no> Fri Jan 26 12:19:29 2024 +0100
committer Fabio Baltieri <fabio.baltieri@gmail.com> Thu Feb 01 10:28:43 2024 +0000
tree 76a5b78eb79572dc39c37d73070ba04798bd09f0
parent 738999e191297c737fda647b5ba73e9897a581a8

version: cmake: kconfig: introduce extra <type>_VERSION_<x>_STRING

Fixes: #68360

This commit introduces <type>_VERSION_TWEAK_STRING which includes
the tweak field in the string, but without the extra version.
This format is used by MCUboot / imgtool, and thus makes it easier to
align code to the format used by MCUboot.

This commit also introduces <type>_VERSION_EXTENDED_STRING which
includes the tweak field in the string in addition to the extra version
field.

The new defines / variables is available in code, CMake, and Kconfig,
and it defined for KERNEL, APP, and custom types, such as MCUBOOT.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

version.h.in

diff --git a/version.h.in b/version.h.in
index 476d97e..bfb2eb3 100644
--- a/version.h.in
+++ b/version.h.in
@@ -9,13 +9,15 @@
 #cmakedefine ZEPHYR_VERSION_CODE @ZEPHYR_VERSION_CODE@
 #cmakedefine ZEPHYR_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
-#define @VERSION_TYPE@VERSION          @@VERSION_TYPE@VERSION@
-#define @VERSION_TYPE@_VERSION_NUMBER  @@VERSION_TYPE@_VERSION_NUMBER@
-#define @VERSION_TYPE@_VERSION_MAJOR   @@VERSION_TYPE@_VERSION_MAJOR@
-#define @VERSION_TYPE@_VERSION_MINOR   @@VERSION_TYPE@_VERSION_MINOR@
-#define @VERSION_TYPE@_PATCHLEVEL      @@VERSION_TYPE@_PATCHLEVEL@
-#define @VERSION_TYPE@_TWEAK           @@VERSION_TYPE@_VERSION_TWEAK@
-#define @VERSION_TYPE@_VERSION_STRING  "@@VERSION_TYPE@_VERSION_STRING@"
+#define @VERSION_TYPE@VERSION                   @@VERSION_TYPE@VERSION@
+#define @VERSION_TYPE@_VERSION_NUMBER           @@VERSION_TYPE@_VERSION_NUMBER@
+#define @VERSION_TYPE@_VERSION_MAJOR            @@VERSION_TYPE@_VERSION_MAJOR@
+#define @VERSION_TYPE@_VERSION_MINOR            @@VERSION_TYPE@_VERSION_MINOR@
+#define @VERSION_TYPE@_PATCHLEVEL               @@VERSION_TYPE@_PATCHLEVEL@
+#define @VERSION_TYPE@_TWEAK                    @@VERSION_TYPE@_VERSION_TWEAK@
+#define @VERSION_TYPE@_VERSION_STRING           "@@VERSION_TYPE@_VERSION_STRING@"
+#define @VERSION_TYPE@_VERSION_EXTENDED_STRING  "@@VERSION_TYPE@_VERSION_EXTENDED_STRING@"
+#define @VERSION_TYPE@_VERSION_TWEAK_STRING     "@@VERSION_TYPE@_VERSION_TWEAK_STRING@"
 
 #define @BUILD_VERSION_NAME@ @@BUILD_VERSION_NAME@@
 @@VERSION_TYPE@_VERSION_CUSTOMIZATION@