Merge pull request nasa#941 from jphickey/fix-940-filename-configdata

Fix nasa#940, Add module suffix and core name to configdata
jphickey · Oct 13, 2020 · b5ada30 · b5ada30
2 parents 85469ce + 655a66c
commit b5ada30
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/cmake/target/CMakeLists.txt b/cmake/target/CMakeLists.txt
@@ -47,6 +47,8 @@ file (REMOVE "${CMAKE_CURRENT_BINARY_DIR}/cfs_static_symbol_list.inc.tmp")
 add_executable(core-${TGTNAME} src/target_config.c)
 
 target_compile_definitions(core-${TGTNAME} PRIVATE 
+    CFE_DEFAULT_MODULE_EXTENSION="${CMAKE_SHARED_MODULE_SUFFIX}"
+    CFE_DEFAULT_CORE_FILENAME="$<TARGET_FILE_NAME:core-${TGTNAME}>"
     CFE_CPU_NAME_VALUE="${TGTNAME}"
     CFE_SPACECRAFT_ID_VALUE=${SPACECRAFT_ID}
     CFE_CPU_ID_VALUE=${${TGTNAME}_PROCESSORID}

diff --git a/cmake/target/inc/target_config.h b/cmake/target/inc/target_config.h
@@ -143,6 +143,9 @@ typedef const struct
     uint16 Default_CpuId;        /**< Compile-time value for CPU number */
     uint16 Default_SpacecraftId; /**< Compile-time value for Spacecraft ID (mission-wide) */
 
+    const char *Default_ModuleExtension; /**< Default system extension for dynamic modules */
+    const char *Default_CoreFilename;    /**< Default file name for CFE core executable/library */
+
     Target_CfeConfigData *CfeConfig;   /**< CFE configuration sub-structure */
     Target_PspConfigData *PspConfig;   /**< PSP configuration sub-structure */
     CFE_StaticModuleLoadEntry_t *PspModuleList; /**< List of PSP modules (API structures) statically linked into the core EXE */

diff --git a/cmake/target/src/target_config.c b/cmake/target/src/target_config.c
@@ -54,6 +54,13 @@
 #define CFE_SPACECRAFT_ID_VALUE     0x42
 #endif
 
+#ifndef CFE_DEFAULT_MODULE_EXTENSION
+#define CFE_DEFAULT_MODULE_EXTENSION    ""
+#endif
+
+#ifndef CFE_DEFAULT_CORE_FILENAME
+#define CFE_DEFAULT_CORE_FILENAME       ""
+#endif
 
 Target_CfeConfigData GLOBAL_CFE_CONFIGDATA =
 {
@@ -139,6 +146,8 @@ Target_ConfigData GLOBAL_CONFIGDATA =
         .Default_CpuName = CFE_CPU_NAME_VALUE,
         .Default_CpuId = CFE_CPU_ID_VALUE,
         .Default_SpacecraftId = CFE_SPACECRAFT_ID_VALUE,
+        .Default_ModuleExtension = CFE_DEFAULT_MODULE_EXTENSION,
+        .Default_CoreFilename = CFE_DEFAULT_CORE_FILENAME,
         .CfeConfig = &GLOBAL_CFE_CONFIGDATA,
         .PspConfig = &GLOBAL_PSP_CONFIGDATA,
         .PspModuleList = GLOBAL_PSP_MODULELIST,