Merge pull request #428 from nasa/integration-candidate

PSP Integration candidate: Equuleus-rc1+dev1
nasa · Jan 18, 2024 · 70be39d · 70be39d
2 parents 79518b3 + a65cfe0
commit 70be39d
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev38
+- updating PSP to use new versioning system
+- conditional module inclusion
+- See <https://github.com/nasa/PSP/pull/422> and <https://github.com/nasa/PSP/pull/427>
+
 ## Development Build: v1.6.0-rc4+dev117
 - Align mismatched function prototype/implem. parameter names
 - See <https://github.com/nasa/PSP/pull/380>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,6 +28,7 @@ target_include_directories(psp_module_api INTERFACE
 
 # Translate the CFE_PSP_TARGETNAME to a set of additional modules to build
 file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/fsw/${CFE_PSP_TARGETNAME}/psp_module_list.cmake" PSP_TARGET_MODULE_LIST REGEX "^[a-zA-Z]")
+include("${CMAKE_CURRENT_LIST_DIR}/fsw/${CFE_PSP_TARGETNAME}/psp_conditional_modules.cmake" OPTIONAL)
 
 # The PSP is currently built in modular parts, consisting of a platform-specific
 # module(s) combined with a shared component which is built for multiple targets.
@@ -72,4 +73,3 @@ if (ENABLE_UNIT_TESTS)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ut-stubs)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/unit-test-coverage)
 endif ()
-
diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -27,15 +27,22 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   115
-#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
+#define CFE_PSP_IMPL_BUILD_NUMBER   38
+#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
@@ -27,15 +27,22 @@
 /*
  * 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_NUMBER   38
+#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
@@ -27,15 +27,22 @@
 /*
  * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER   115
-#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"
+#define CFE_PSP_IMPL_BUILD_NUMBER   38
+#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/psp_conditional_modules.cmake b/fsw/pc-rtems/psp_conditional_modules.cmake
@@ -0,0 +1,8 @@
+# The sysmon module only works in RTEMS >= 5.
+# Ideally this check should be VERSION_GREATER_EQUAL 5, but that conditional does
+# not exist in all versions of cmake.
+if(CMAKE_SYSTEM_VERSION VERSION_GREATER 4.99)
+
+    list(APPEND PSP_TARGET_MODULE_LIST rtems_sysmon)
+
+endif()
diff --git a/fsw/pc-rtems/psp_module_list.cmake b/fsw/pc-rtems/psp_module_list.cmake
@@ -1,10 +1,13 @@
 # This is a list of modules that is included as a fixed/base set
-# when this PSP is selected.  They must exist under fsw/modules
+# when this PSP is selected.  They must exist under fsw/modules.
+
+# NOTE: This set is REQUIRED for all versions of the platform.
+# If a module only works on some versions of the platform, add
+# if to psp_conditional_modules.cmake instead
 
 soft_timebase
 timebase_posix_clock
 eeprom_notimpl
 ram_direct
 port_notimpl
 iodriver
-rtems_sysmon
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;
 }
 
 /*----------------------------------------------------------------