Merge pull request #1222 from skliper/ic-20210312

Integration candidate: 2021-03-12

README.md

@@ -10,6 +10,13 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
 
 ## Version History
 
+### Development Build: v6.8.0-rc1+dev402
+
+- HOTFIX 20210312, updates to work with older CMake
+- Fix #972, reorganize directory structure
+- HOTFIX IC 2021-03-05: Correct static app build issue
+- See <https://github.com/nasa/cFE/pull/1222>
+
 ### Development Build: v6.8.0-rc1+dev392
 
 - Fix #665, update pipe name documentation.

cmake/arch_build.cmake

@@ -189,10 +189,17 @@ function(add_cfe_tables APP_NAME TBL_SRC_FILES)
       else()
         message("NOTE: Selected ${TBL_SRC} as source for ${TBLWE}")
       endif()    
-
-      add_library(${TGT}_${TBLWE}-obj OBJECT ${TBL_SRC})
+
+      # NOTE: On newer CMake versions this should become an OBJECT library which makes this simpler.
+      # On older versions one may not referece the TARGET_OBJECTS property from the custom command.
+      # As a workaround this is built into a static library, and then the desired object is extracted
+      # before passing to elf2cfetbl.  It is roundabout but it works.
+      add_library(${TGT}_${TBLWE}-obj STATIC ${TBL_SRC})
       target_link_libraries(${TGT}_${TBLWE}-obj PRIVATE core_api)
 
+      get_filename_component(TBLOBJ ${TBL} NAME)
+      string(APPEND TBLOBJ ${CMAKE_C_OUTPUT_EXTENSION})
+
       # IMPORTANT: This rule assumes that the output filename of elf2cfetbl matches
       # the input file name but with a different extension (.o -> .tbl)
       # The actual output filename is embedded in the source file (.c), however
@@ -201,7 +208,8 @@ function(add_cfe_tables APP_NAME TBL_SRC_FILES)
       # current content of a dependency (rightfully so).
       add_custom_command(
         OUTPUT "${TABLE_DESTDIR}/${TBLWE}.tbl"
-        COMMAND ${MISSION_BINARY_DIR}/tools/elf2cfetbl/elf2cfetbl $<TARGET_OBJECTS:${TGT}_${TBLWE}-obj>
+        COMMAND ${CMAKE_AR} x $<TARGET_FILE:${TGT}_${TBLWE}-obj>
+        COMMAND ${MISSION_BINARY_DIR}/tools/elf2cfetbl/elf2cfetbl "${TBLOBJ}"
         DEPENDS ${MISSION_BINARY_DIR}/tools/elf2cfetbl/elf2cfetbl ${TGT}_${TBLWE}-obj
         WORKING_DIRECTORY ${TABLE_DESTDIR}
       )
@@ -462,7 +470,7 @@ function(cfs_app_check_intf MODULE_NAME)
         configure_file(${CFE_SOURCE_DIR}/cmake/check_header.c.in ${CMAKE_CURRENT_BINARY_DIR}/src/check_${HDR}.c)
         list(APPEND ${MODULE_NAME}_hdrcheck_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/src/check_${HDR}.c)
     endforeach(HDR ${ARGN})
-    add_library(${MODULE_NAME}_headercheck OBJECT ${${MODULE_NAME}_hdrcheck_SOURCES})
+    add_library(${MODULE_NAME}_headercheck STATIC EXCLUDE_FROM_ALL ${${MODULE_NAME}_hdrcheck_SOURCES})
 
     # This causes the check to compile with the same set of defines and include dirs as specified
     # in the "INTERFACE" properties of the actual module

cmake/cfe-usersguide.doxyfile.in

@@ -22,3 +22,6 @@ PREDEFINED            += @USERGUIDE_PREDEFINED@
 
 # Bring in the cFE header files for the documentation of the various API calls
 INPUT                 += @MISSION_USERGUIDE_HEADERFILES@
+
+# Resolve references
+INPUT                 += @MISSION_SOURCE_DIR@/psp/fsw/inc

cmake/mission-detaildesign.doxyfile.in

@@ -13,7 +13,17 @@ INPUT                 += @MISSION_DEFS@  \
                          @MISSION_SOURCE_DIR@/osal/src/os/shared \
                          @MISSION_SOURCE_DIR@/psp/fsw/inc \
                          @MISSION_SOURCE_DIR@/psp/fsw/shared \
-                         @MISSION_SOURCE_DIR@/cfe/fsw/cfe-core/src
+                         @MISSION_SOURCE_DIR@/cfe/modules/core_api/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/core_private/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/es/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/evs/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/fs/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/msg/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/resourceid/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/sb/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/sbr/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/tbl/fsw \
+                         @MISSION_SOURCE_DIR@/cfe/modules/time/fsw
 
 STRIP_FROM_PATH       += @MISSION_DEFS@
 

cmake/mission_defaults.cmake

@@ -51,7 +51,7 @@ set(MISSION_MODULE_SEARCH_PATH
 
 # The path for specific components can also be set via
 # a variable named "<component>_SEARCH_PATH".  This is
-# used for locating cfe-core and osal which are not part
+# used for locating other modules that are not part
 # of the standard search path.
 set(osal_SEARCH_PATH ".")
 set(psp_SEARCH_PATH ".")

modules/core_api/fsw/inc/cfe_es_core_internal.h

@@ -128,8 +128,8 @@ int32 CFE_ES_RegisterCDSEx(CFE_ES_CDSHandle_t *HandlePtr, size_t UserBlockSize,
 ** \return #CFE_ES_CDS_WRONG_TYPE_ERR       \copydoc CFE_ES_CDS_WRONG_TYPE_ERR
 ** \return #CFE_ES_CDS_OWNER_ACTIVE_ERR     \copydoc CFE_ES_CDS_OWNER_ACTIVE_ERR
 ** \return #CFE_ES_ERR_NAME_NOT_FOUND       \copydoc CFE_ES_ERR_NAME_NOT_FOUND
-** \return Any of the return values from #CFE_ES_UpdateCDSRegistry
-** \return Any of the return values from #CFE_ES_GenPoolPutBlock
+** \return Any of the return values from CFE_ES_UpdateCDSRegistry
+** \return Any of the return values from CFE_ES_GenPoolPutBlock
 **
 ******************************************************************************/
 int32  CFE_ES_DeleteCDS(const char *CDSName, bool CalledByTblServices);

modules/core_api/fsw/inc/cfe_version.h

@@ -33,7 +33,7 @@
 
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER 392 /*!< Development Build: Number of commits since baseline */
+#define CFE_BUILD_NUMBER 402 /*!< Development Build: Number of commits since baseline */
 #define CFE_BUILD_BASELINE "v6.8.0-rc1" /*!< Development Build: git tag that is the base for the current development */
 
 /* Version Macro Definitions */