Fix #412, updating PSP to use new versioning system.

nasa · Dec 27, 2023 · b9f1a09 · b9f1a09
1 parent f27c73e
commit b9f1a09
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 32 deletions.
diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -28,7 +28,10 @@
  * Development Build Macro Definitions
  */
 #define CFE_PSP_IMPL_BUILD_NUMBER   102
-#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
+#define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
+#define CFE_PSP_BUILD_DEV_CYCLE     "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
+#define CFE_PSP_BUILD_TYPE          "Development Build" /**< @brief: Development: Type of build (Development Build or Release) */
+#define CFE_PSP_BUILD_CODENAME      "Equuleus" /**< @brief: Development: Code name for the current build */
 
 /*
  * Version Macros, see \ref cfsversions for definitions.
@@ -37,16 +40,19 @@
 #define CFE_PSP_IMPL_MINOR_VERSION 4  /*!< @brief Minor version number */
 #define CFE_PSP_IMPL_REVISION      99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
 
+/**
+ * @brief Last official release.
+ */
+#define CFE_PSP_LAST_OFFICIAL "v1.4.0"
+
 /*!
  * @brief Mission revision.
  *
  * Reserved for mission use to denote patches/customizations as needed.
  * Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
  * cFS open-source development use (pending resolution of nasa/cFS#440)
  */
-#define CFE_PSP_IMPL_MISSION_REV 0xFF
-
-#define CFE_PSP_IMPL_CODENAME "Draco"
+#define CFE_PSP_IMPL_MISSION_REV 0x00
 
 /*
  * Tools to construct version string
@@ -61,12 +67,12 @@
  */
 #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.
- *  @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.
+/**
+ * @brief Max Version String length.
+ * 
+ * Maximum length that a tblCRCTool version string can be.
+ * 
  */
-#define CFE_PSP_IMPL_VERSION_STRING                \
-    " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION \
-    ", Last Official Release: psp v1.4.0" /* For full support please use this version */
+#define CFE_PSP_CFG_MAX_VERSION_STR_LEN 256
 
 #endif
diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
@@ -28,7 +28,10 @@
  * Development Build Macro Definitions
  */
 #define CFE_PSP_IMPL_BUILD_NUMBER   102
-#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
+#define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
+#define CFE_PSP_BUILD_DEV_CYCLE     "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
+#define CFE_PSP_BUILD_TYPE          "Development Build" /**< @brief: Development: Type of build (Development Build or Release) */
+#define CFE_PSP_BUILD_CODENAME      "Equuleus" /**< @brief: Development: Code name for the current build */
 
 /*
  * Version Macros, see \ref cfsversions for definitions.
@@ -37,16 +40,19 @@
 #define CFE_PSP_IMPL_MINOR_VERSION 4  /*!< @brief Minor version number */
 #define CFE_PSP_IMPL_REVISION      99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
 
+/**
+ * @brief Last official release.
+ */
+#define CFE_PSP_LAST_OFFICIAL "v1.4.0"
+
 /*!
  * @brief Mission revision.
  *
  * Reserved for mission use to denote patches/customizations as needed.
  * Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
  * cFS open-source development use (pending resolution of nasa/cFS#440)
  */
-#define CFE_PSP_IMPL_MISSION_REV 0xFF
-
-#define CFE_PSP_IMPL_CODENAME "Draco"
+#define CFE_PSP_IMPL_MISSION_REV 0x00
 
 /*
  * Tools to construct version string
@@ -61,12 +67,12 @@
  */
 #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.
- *  @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.
+/**
+ * @brief Max Version String length.
+ * 
+ * Maximum length that a tblCRCTool version string can be.
+ * 
  */
-#define CFE_PSP_IMPL_VERSION_STRING                \
-    " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION \
-    ", Last Official Release: psp v1.4.0" /* For full support please use this version */
+#define CFE_PSP_CFG_MAX_VERSION_STR_LEN 256
 
 #endif
diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
@@ -28,7 +28,10 @@
  * Development Build Macro Definitions
  */
 #define CFE_PSP_IMPL_BUILD_NUMBER   102
-#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
+#define CFE_PSP_IMPL_BUILD_BASELINE "equuleus-rc1"
+#define CFE_PSP_BUILD_DEV_CYCLE     "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
+#define CFE_PSP_BUILD_TYPE          "Development Build" /**< @brief: Development: Type of build (Development Build or Release) */
+#define CFE_PSP_BUILD_CODENAME      "Equuleus" /**< @brief: Development: Code name for the current build */
 
 /*
  * Version Macros, see \ref cfsversions for definitions.
@@ -37,16 +40,19 @@
 #define CFE_PSP_IMPL_MINOR_VERSION 4  /*!< @brief Minor version number */
 #define CFE_PSP_IMPL_REVISION      99 /*!< @brief Revision version number. Value of 99 indicates a development version.*/
 
+/**
+ * @brief Last official release.
+ */
+#define CFE_PSP_LAST_OFFICIAL "v1.4.0"
+
 /*!
  * @brief Mission revision.
  *
  * Reserved for mission use to denote patches/customizations as needed.
  * Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
  * cFS open-source development use (pending resolution of nasa/cFS#440)
  */
-#define CFE_PSP_IMPL_MISSION_REV 0xFF
-
-#define CFE_PSP_IMPL_CODENAME "Draco"
+#define CFE_PSP_IMPL_MISSION_REV 0x00
 
 /*
  * Tools to construct version string
@@ -61,12 +67,12 @@
  */
 #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.
- *  @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.
+/**
+ * @brief Max Version String length.
+ * 
+ * Maximum length that a tblCRCTool version string can be.
+ * 
  */
-#define CFE_PSP_IMPL_VERSION_STRING                \
-    " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION \
-    ", Last Official Release: psp v1.4.0" /* For full support please use this version */
+#define CFE_PSP_CFG_MAX_VERSION_STR_LEN 256
 
 #endif
diff --git a/fsw/shared/src/cfe_psp_version.c b/fsw/shared/src/cfe_psp_version.c
@@ -33,7 +33,14 @@
  *-----------------------------------------------------------------*/
 const char *CFE_PSP_GetVersionString(void)
 {
-    return CFE_PSP_IMPL_VERSION;
+    char VersionString[CFE_PSP_CFG_MAX_VERSION_STR_LEN];
+
+    snprintf(VersionString, CFE_PSP_CFG_MAX_VERSION_STR_LEN,
+        "%s %s %s (Codename %s), Last Official Release: %s %s)",
+        "PSP", CFE_PSP_BUILD_TYPE, CFE_PSP_IMPL_VERSION,
+        CFE_PSP_BUILD_CODENAME, "PSP", CFE_PSP_LAST_OFFICIAL);
+
+    return &VersionString;
 }
 
 /*----------------------------------------------------------------
@@ -44,7 +51,7 @@ const char *CFE_PSP_GetVersionString(void)
  *-----------------------------------------------------------------*/
 const char *CFE_PSP_GetVersionCodeName(void)
 {
-    return CFE_PSP_IMPL_CODENAME;
+    return CFE_PSP_BUILD_CODENAME;
 }
 
 /*----------------------------------------------------------------