Merge pull request #2325 from nasa/integration-candidate

cFE Integration candidate: Caelum-rc4+dev49

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Development Build: v7.0.0-rc4+dev304
+- reorganize headers
+- Update XML files per interoperability testing
+- uniqueness of tbl target names
+- See <https://github.com/nasa/cFE/pull/2321>, <https://github.com/nasa/cFE/pull/2314>, and <https://github.com/nasa/cFE/pull/2319>
+
 ## Development Build: v7.0.0-rc4+dev287
 - document CFS component file naming
 - Add EVS port timestamp and simplify port selection

cmake/arch_build.cmake

@@ -194,6 +194,23 @@ function(add_cfe_tables TABLE_FQNAME TBL_DEFAULT_SRC_FILES)
 
     get_filename_component(APP_NAME ${TABLE_FQNAME} NAME_WE)
 
+    # The passed-in name allows for a qualifier (in the form of APP_NAME.QUALIFIER) to get
+    # uniqueness in the generated target names.  If there is no qualifier, then there
+    # will potentially be a target name conflict.  To avoid this, generate a hash of the
+    # context of this call - the current directory, app/tgt names, and source files.  This
+    # should be unique but also produce the same hash when CMake is re-run.  The hash
+    # can then be used as a qualifier.
+    if (TABLE_FQNAME STREQUAL APP_NAME)
+      string(SHA1 CONTEXT_HASH
+        "${CMAKE_CURRENT_LIST_DIR}+${TGTNAME}+${APP_NAME}+${TBL_DEFAULT_SRC_FILES};${ARGN}"
+      )
+      set(TABLE_FQNAME "${APP_NAME}.tbl${CONTEXT_HASH}")
+
+      if ($ENV{VERBOSE})
+        message("No suffix specified, table build using ${TABLE_FQNAME} for ${APP_NAME} table")
+      endif()
+    endif()
+
     # If "TGTNAME" is set, then use it directly
     set(TABLE_TGTLIST ${TGTNAME})
     set(TABLE_TEMPLATE "${CFE_SOURCE_DIR}/cmake/tables/table_rule_template.d.in")

cmake/global_functions.cmake

@@ -65,6 +65,9 @@ function(cfe_locate_implementation_file OUTPUT_VAR FILE_NAME)
 
   set(SELECTED_FILE)
   foreach (CHECK_FILE ${IMPL_SEARCH_PATH})
+    if ($ENV{VERBOSE})
+      message("Testing for: ${CHECK_FILE}")
+    endif()
     if (EXISTS "${CHECK_FILE}")
       list(APPEND SELECTED_FILE ${CHECK_FILE})
     endif()
@@ -76,12 +79,13 @@ function(cfe_locate_implementation_file OUTPUT_VAR FILE_NAME)
     else()
       set(SELECTED_FILE "${CMAKE_CURRENT_LIST_DIR}/${LOCATEIMPL_ARG_FALLBACK_FILE}")
     endif()
+    if (NOT EXISTS "${SELECTED_FILE}" AND NOT LOCATEIMPL_ARG_OPTIONAL)
+      message(FATAL_ERROR "No implementation for ${FILE_NAME} found")
+    endif()
   endif()
 
   if (SELECTED_FILE)
     message(STATUS "Using file: ${SELECTED_FILE} for ${FILE_NAME}")
-  elseif(NOT LOCATEIMPL_ARG_OPTIONAL)
-    message(FATAL_ERROR "No implementation for ${FILE_NAME} found")
   endif()
 
   # Export the result to the caller

cmake/mission_build.cmake

@@ -308,7 +308,12 @@ function(prepare)
     "${psp_MISSION_DIR}/psp/fsw/inc/*.h"
   )
   foreach(MODULE core_api ${MISSION_CORE_MODULES})
-    list(APPEND SUBMODULE_HEADER_PATHS "${${MODULE}_MISSION_DIR}/fsw/inc/*.h")
+    if (IS_DIRECTORY "${${MODULE}_MISSION_DIR}/fsw/inc")
+      list(APPEND SUBMODULE_HEADER_PATHS "${${MODULE}_MISSION_DIR}/fsw/inc/*.h")
+    endif()
+    if (IS_DIRECTORY "${${MODULE}_MISSION_DIR}/config")
+      list(APPEND SUBMODULE_HEADER_PATHS "${${MODULE}_MISSION_DIR}/config/default_*.h")
+    endif()
   endforeach()
   file(GLOB MISSION_USERGUIDE_HEADERFILES
     ${SUBMODULE_HEADER_PATHS}