Move buildnumber information to cfe_psp.h

nasa · Jul 15, 2020 · 2b99e0f · 2b99e0f
1 parent c5bc2b4
commit 2b99e0f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/fsw/inc/cfe_psp.h b/fsw/inc/cfe_psp.h
@@ -43,6 +43,7 @@
 #include "common_types.h"
 #include "osapi.h"
 
+
 /*
 ** Macro Definitions
 */
@@ -137,12 +138,25 @@
 #define CFE_PSP_RST_SUBTYPE_MAX                   10  /**< \brief  Placeholder to indicate 1+ the maximum value that the PSP will ever use. */
 /** \} */
 
+
 /* Implement the "version" macros */
 #define CFE_PSP_MAJOR_VERSION          (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.MajorVersion)
 #define CFE_PSP_MINOR_VERSION          (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.MinorVersion)
 #define CFE_PSP_REVISION               (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.Revision)
 #define CFE_PSP_MISSION_REV            (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.MissionRev)
 
+#define PSP_STR_HELPER(x) #x
+#define PSP_STR(x)        PSP_STR_HELPER(x)
+
+#define PSP_BUILDNUMBER 68 /* Number of commits since baseline */
+
+/* Baseling git tag + Number of commits since baseline */
+#define CFE_PSP_VERSION "v1.4.0+dev" PSP_STR(PSP_BUILDNUMBER)
+
+#define PSP_VERSION_STRING                                                                               \
+    " psp development build \n" PSP_VERSION " (Codename: Bootes)" /* Codename for current development */ \
+    "\n Last Official Release: psp v1.4.0"                        /* For full support please use this version */
+
 /*
 ** Type Definitions
 */

diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -30,12 +30,6 @@
 #ifndef _psp_version_
 #define _psp_version_
 
-/*
-** Development build identifiers
-*/
-#define CFE_PSP_BASELINE    "Bootes"
-#define CFE_PSP_BUILDNUMBER 67
-
 /*
 ** Macro Definitions
 */

diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
@@ -30,12 +30,6 @@
 #ifndef _psp_version_
 #define _psp_version_
 
-/*
- * Development build identifiers
- */
-#define CFE_PSP_BASELINE    "Bootes"
-#define CFE_PSP_BUILDNUMBER 67
-
 /*
 ** Macro Definitions
 */

diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
@@ -30,12 +30,6 @@
 #ifndef _psp_version_
 #define _psp_version_
 
-/*
- * Development build identifiers
- */
-#define CFE_PSP_BASELINE    "Bootes"
-#define CFE_PSP_BUILDNUMBER 67
-
 /*
 ** Macro Definitions
 */