Merge pull request #2418 from nasa/integration-candidate

cFE Integration candidate: Caelum-rc4+dev54
nasa · Jul 27, 2023 · 8852743 · 8852743
2 parents a8b20ac + 6cc5645
commit 8852743
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: v7.0.0-rc4+dev356
+- 'Fix #2415, use correct object extension in table build'
+- See: <https://github.com/nasa/cFE/pull/2416>
+
+
 ## Development Build: v7.0.0-rc4+dev342
 - 'Fix #2368, cFE Functional Test 23'
 - 'Fix #1407, Add error report on EVS failure during log header write'
@@ -104,6 +109,11 @@
 ## Development Build: v7.0.0-rc4+dev197
 - Remove # Changelog
 
+## Development Build: v7.0.0-rc4+dev356
+- 'Fix #2415, use correct object extension in table build'
+- See: <https://github.com/nasa/cFE/pull/2416>
+
+
 ## Development Build: v7.0.0-rc4+dev342
 - 'Fix #2368, cFE Functional Test 23'
 - 'Fix #1407, Add error report on EVS failure during log header write'

diff --git a/cmake/arch_build.cmake b/cmake/arch_build.cmake
@@ -312,6 +312,7 @@ function(add_cfe_tables TABLE_FQNAME TBL_DEFAULT_SRC_FILES)
             -DOUTPUT_FILE="${TABLE_RULEFILE}"
             -DTABLE_NAME="${TABLE_BASENAME}"
             -DSOURCES="${TBL_SRC}"
+            -DOBJEXT="${CMAKE_C_OUTPUT_EXTENSION}"
             -P "${TABLE_GENSCRIPT}"
           WORKING_DIRECTORY
             ${WORKING_DIRECTORY}

diff --git a/cmake/tables/elf2cfetbl_rules.mk b/cmake/tables/elf2cfetbl_rules.mk
@@ -1,5 +1,5 @@
 # Rule for traditional CFE table generation via elf2cfetbl
 
-elf/%.o:
+elf/%:
 	@mkdir -pv $(dir $(@))
 	cd $(dir $(@)) && $(AR) x $(abspath $(<)) $(notdir $(@))
diff --git a/cmake/tables/generate_elf_table_rules.cmake b/cmake/tables/generate_elf_table_rules.cmake
@@ -22,7 +22,7 @@ set(TABLE_RULES)
 foreach(TBL_SRC ${SOURCES})
 
     get_filename_component(DEP_FILE ${TBL_SRC} NAME)
-    set(DEP_FILE "${TMP_DIR}/${DEP_FILE}.o")
+    set(DEP_FILE "${TMP_DIR}/${DEP_FILE}${OBJEXT}")
     string(APPEND TABLE_RULES
         "${DEP_FILE}: ${ARCHIVE_FILE}\n"
         "${TABLE_BINARY}: ${DEP_FILE}\n"

diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h
@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER   342 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER   356 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
 
 /* See \ref cfsversions for definitions */