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

nasa · Jan 17, 2024 · 12cf76e · 12cf76e
1 parent f27c73e
commit 12cf76e
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 31 deletions.
diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -28,14 +28,21 @@
  * 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_CODENAME      "Equuleus" /**< @brief: Development: Code name for the current build */
 
 /*
  * Version Macros, see \ref cfsversions for definitions.
  */
 #define CFE_PSP_IMPL_MAJOR_VERSION 1  /*!< @brief Major version number */
 #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.*/
+#define CFE_PSP_IMPL_REVISION      0  /*!< @brief Revision version number. Value of 0 indicates a development version.*/
+
+/**
+ * @brief Last official release.
+ */
+#define CFE_PSP_LAST_OFFICIAL "v1.4.0"
 
 /*!
  * @brief Mission revision.
@@ -46,8 +53,6 @@
  */
 #define CFE_PSP_IMPL_MISSION_REV 0xFF
 
-#define CFE_PSP_IMPL_CODENAME "Draco"
-
 /*
  * Tools to construct version string
  */
@@ -61,12 +66,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,14 +28,21 @@
  * 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_CODENAME      "Equuleus" /**< @brief: Development: Code name for the current build */
 
 /*
  * Version Macros, see \ref cfsversions for definitions.
  */
 #define CFE_PSP_IMPL_MAJOR_VERSION 1  /*!< @brief Major version number */
 #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.*/
+#define CFE_PSP_IMPL_REVISION      0  /*!< @brief Revision version number. Value of 0 indicates a development version.*/
+
+/**
+ * @brief Last official release.
+ */
+#define CFE_PSP_LAST_OFFICIAL "v1.4.0"
 
 /*!
  * @brief Mission revision.
@@ -46,8 +53,6 @@
  */
 #define CFE_PSP_IMPL_MISSION_REV 0xFF
 
-#define CFE_PSP_IMPL_CODENAME "Draco"
-
 /*
  * Tools to construct version string
  */
@@ -61,12 +66,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,14 +28,21 @@
  * 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_CODENAME      "Equuleus" /**< @brief: Development: Code name for the current build */
 
 /*
  * Version Macros, see \ref cfsversions for definitions.
  */
 #define CFE_PSP_IMPL_MAJOR_VERSION 1  /*!< @brief Major version number */
 #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.*/
+#define CFE_PSP_IMPL_REVISION      0  /*!< @brief Revision version number. Value of 0 indicates a development version.*/
+
+/**
+ * @brief Last official release.
+ */
+#define CFE_PSP_LAST_OFFICIAL "v1.4.0"
 
 /*!
  * @brief Mission revision.
@@ -46,8 +53,6 @@
  */
 #define CFE_PSP_IMPL_MISSION_REV 0xFF
 
-#define CFE_PSP_IMPL_CODENAME "Draco"
-
 /*
  * Tools to construct version string
  */
@@ -61,12 +66,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
@@ -44,7 +44,7 @@ const char *CFE_PSP_GetVersionString(void)
  *-----------------------------------------------------------------*/
 const char *CFE_PSP_GetVersionCodeName(void)
 {
-    return CFE_PSP_IMPL_CODENAME;
+    return CFE_PSP_BUILD_CODENAME;
 }
 
 /*----------------------------------------------------------------