Fix #241, add missing '+dev' string to development version report

nasa · Jan 13, 2021 · 4b167a5 · 4b167a5
1 parent b3dcd45
commit 4b167a5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/fsw/inc/cfe_psp.h b/fsw/inc/cfe_psp.h
@@ -143,7 +143,7 @@
 #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 CFE_PSP_VERSION                (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.Version)
+#define CFE_PSP_VERSION                (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.VersionString)
 
 /*
 ** Type Definitions

diff --git a/fsw/inc/cfe_psp_configdata.h b/fsw/inc/cfe_psp_configdata.h
@@ -43,7 +43,7 @@ typedef const struct
    uint8 MinorVersion;
    uint8 Revision;
    uint8 MissionRev;
-   char  Version[16];
+   char  VersionString[32];
 } CFE_PSP_VersionInfo_t;
 
 

diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -46,13 +46,13 @@
 #define CFE_PSP_IMPL_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer */ 
 #define CFE_PSP_IMPL_STR(x)        CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */
 
-/*! @brief Development Build Version Number. 
+/*! @brief DEVELOPMENT Build Version Number. 
  *  @details Baseline git tag + Number of commits since baseline. @n
  *  See @ref cfsversions for format differences between development and release versions.
  */
-#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
+#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE "+dev" CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
 
-/*! @brief Development Build Version String.
+/*! @brief DEVELOPMENT Build Version String.
  *  @details Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n
  *  See @ref cfsversions for format differences between development and release versions. 
  */     

diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
@@ -46,13 +46,13 @@
 #define CFE_PSP_IMPL_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer */ 
 #define CFE_PSP_IMPL_STR(x)        CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */
 
-/*! @brief Development Build Version Number. 
+/*! @brief DEVELOPMENT Build Version Number. 
  *  @details Baseline git tag + Number of commits since baseline. @n
  *  See @ref cfsversions for format differences between development and release versions.
  */
-#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
+#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE "+dev" CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
 
-/*! @brief Development Build Version String.
+/*! @brief DEVELOPMENT Build Version String.
  *  @details Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n
  *  See @ref cfsversions for format differences between development and release versions. 
  */     

diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
@@ -47,13 +47,13 @@
 #define CFE_PSP_IMPL_STR(x) \
     CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */
 
-/*! @brief Development Build Version Number.
+/*! @brief DEVELOPMENT Build Version Number.
  *  @details Baseline git tag + Number of commits since baseline. @n
  *  See @ref cfsversions for format differences between development and release versions.
  */
-#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
+#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE "+dev" CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
 
-/*! @brief Development Build Version String.
+/*! @brief DEVELOPMENT Build Version String.
  *  @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
  * official version. @n See @ref cfsversions for format differences between development and release versions.
  */

diff --git a/fsw/shared/src/cfe_psp_configdata.c b/fsw/shared/src/cfe_psp_configdata.c
@@ -53,6 +53,6 @@ Target_PspConfigData GLOBAL_PSP_CONFIGDATA =
             .MinorVersion = CFE_PSP_IMPL_MINOR_VERSION,
             .Revision = CFE_PSP_IMPL_REVISION,
             .MissionRev = CFE_PSP_IMPL_MISSION_REV,
-            .Version = CFE_PSP_IMPL_VERSION
+            .VersionString = CFE_PSP_IMPL_VERSION
       }
 };