diff --git a/README.md b/README.md index 9fead4740..df22dc40d 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,14 @@ The detailed cFE user's guide can be viewed at + ### Development Build: 6.7.0+dev289 - Update `CFE_SB_TimeStampMsg` to save the message pointer argument `UT_Stub_CopyFromLocal` so that unit tests can check it diff --git a/cmake/sample_defs/toolchain-ppc-vxworks6.9.cmake b/cmake/sample_defs/toolchain-ppc-vxworks6.9.cmake index 900f0e147..e33754b41 100644 --- a/cmake/sample_defs/toolchain-ppc-vxworks6.9.cmake +++ b/cmake/sample_defs/toolchain-ppc-vxworks6.9.cmake @@ -7,11 +7,24 @@ set(CMAKE_SYSTEM_PROCESSOR ppc) set(CMAKE_SYSTEM_VERSION 6.9) set(VXWORKS_GCC_VERSION 4.3.3) set(VXWORKS_HOST_VERSION x86-linux2) + +# The VxWorks toolchain relies on several environment variables, +# which should be set already by an environment setup script. + +# WIND_HOME refers to the top-level installation directory set(WIND_HOME_DFL "$ENV{WIND_HOME}") if(NOT WIND_HOME_DFL) set(WIND_HOME_DFL "/opt/WindRiver") endif(NOT WIND_HOME_DFL) -set(WIND_HOME "${WIND_HOME_DFL}" CACHE PATH "Wind River installation directory") +set(WIND_HOME "${WIND_HOME_DFL}" CACHE PATH "Wind River top level installation directory") + +# WIND_BASE refers to the system-specific installation directory (e.g. vxworks-) +set(WIND_BASE_DFL "$ENV{WIND_BASE}") +if(NOT WIND_BASE_DFL) + set(WIND_BASE_DFL "${WIND_HOME}/vxworks-${CMAKE_SYSTEM_VERSION}") +endif(NOT WIND_BASE_DFL) +set(WIND_BASE "${WIND_BASE_DFL}" CACHE PATH "Wind River product installation directory") + set(VXWORKS_TOOLS_PREFIX "${WIND_HOME}/gnu/${VXWORKS_GCC_VERSION}-vxworks-${CMAKE_SYSTEM_VERSION}/${VXWORKS_HOST_VERSION}") @@ -30,10 +43,6 @@ SET(CMAKE_AR "${SDKHOSTBINDIR}/ar${TARGETSUFFIX}") SET(CMAKE_OBJDUMP "${SDKHOSTBINDIR}/objdump${TARGETSUFFIX}") SET(CMAKE_RANLIB "${SDKHOSTBINDIR}/ranlib${TARGETSUFFIX}") -# Note that CEXP is not a shared library loader - it will not support code compiled with -fPIC -# Also exception handling is very iffy. These two options disable eh_frame creation. -#set(CMAKE_C_COMPILE_OPTIONS_PIC -fno-exceptions -fno-asynchronous-unwind-tables) - # search for programs in the build host directories SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) @@ -46,6 +55,7 @@ SET(CMAKE_PREFIX_PATH /) # these settings are specific to cFE/OSAL and determines which # abstraction layers are built when using this toolchain SET(CFE_SYSTEM_PSPNAME mcp750-vxworks) -SET(OSAL_SYSTEM_BSPTYPE mcp750-vxworks) -SET(OSAL_SYSTEM_OSTYPE vxworks) + +include_directories(${WIND_BASE}/target/h/wrn/coreip) +include_directories(${WIND_BASE}/target/h) diff --git a/docs/src/cfs_versions.dox b/docs/src/cfs_versions.dox index d936a6a74..ab991dc55 100644 --- a/docs/src/cfs_versions.dox +++ b/docs/src/cfs_versions.dox @@ -84,11 +84,11 @@ * Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n * See cfs_versions.dox for format differences between development and release versions. */ - #define CFE_VERSION_STRING \ - " cFE Development Build\n " \ - CFE_SRC_VERSION " (Codename: CONSTELLATION_NAME)" /* Codename for current development */ \ - "\n Last Offical Release: cfe vX.Y.Z" /* For full support please use this version */ - + #define CFE_VERSION_STRING \ + " cFE Development Build " \ + CFE_SRC_VERSION " (Codename: CONSTELLATION_NAME)" /* Codename for current development */ \ + ", Last Official Release: cfe vX.Y.Z" /* For full support please use this version */ + \endverbatim **/ diff --git a/fsw/cfe-core/src/es/cfe_es_task.c b/fsw/cfe-core/src/es/cfe_es_task.c index 8e2f10989..af43be5ac 100644 --- a/fsw/cfe-core/src/es/cfe_es_task.c +++ b/fsw/cfe-core/src/es/cfe_es_task.c @@ -354,7 +354,7 @@ int32 CFE_ES_TaskInit(void) #ifdef CFE_PSP_VERSION Status = CFE_EVS_SendEvent(CFE_ES_INITSTATS_INF_EID, CFE_EVS_EventType_INFORMATION, - "\n%s%s\n cFE chksm %d", + "%s%s. cFE chksm %d", CFS_VERSIONS, CFE_PSP_VERSION, (int)CFE_ES_TaskData.HkPacket.Payload.CFECoreChecksum); #else /* if CFE_PSP_VERSION not defined use integer version macros*/ diff --git a/fsw/cfe-core/src/evs/cfe_evs_task.c b/fsw/cfe-core/src/evs/cfe_evs_task.c index ad5d9e4dc..ec61392be 100644 --- a/fsw/cfe-core/src/evs/cfe_evs_task.c +++ b/fsw/cfe-core/src/evs/cfe_evs_task.c @@ -333,7 +333,7 @@ int32 CFE_EVS_TaskInit ( void ) /* Write the AppID to the global location, now that the rest of initialization is done */ CFE_EVS_GlobalData.EVS_AppID = AppID; - EVS_SendEvent(CFE_EVS_STARTUP_EID, CFE_EVS_EventType_INFORMATION, "cFE EVS Initialized.\n%s", CFE_VERSION_STRING); + EVS_SendEvent(CFE_EVS_STARTUP_EID, CFE_EVS_EventType_INFORMATION, "cFE EVS Initialized.%s", CFE_VERSION_STRING); return CFE_SUCCESS; diff --git a/fsw/cfe-core/src/inc/cfe_version.h b/fsw/cfe-core/src/inc/cfe_version.h index 9ae2607b5..f58244946 100644 --- a/fsw/cfe-core/src/inc/cfe_version.h +++ b/fsw/cfe-core/src/inc/cfe_version.h @@ -35,7 +35,7 @@ /* Development Build Macro Definitions */ -#define CFE_BUILD_NUMBER 289 /*!< Development Build: Number of commits since baseline */ +#define CFE_BUILD_NUMBER 292 /*!< Development Build: Number of commits since baseline */ #define CFE_BUILD_BASELINE "v6.7.0" /*!< Development Build: git tag that is the base for the current development */ /* Version Macro Definitions */ @@ -59,9 +59,9 @@ * See @ref cfsversions for format differences between development and release versions. */ #define CFE_VERSION_STRING \ - " cFE Development Build\n " \ + " cFE DEVELOPMENT BUILD " \ CFE_SRC_VERSION " (Codename: Bootes)" /* Codename for current development */ \ - "\n Last Offical Release: cfe v6.7.0" /* For full support please use this version */ + ", Last Official Release: cfe v6.7.0" /* For full support please use this version */ /*! @brief OSAL Version Definitions. @@ -78,9 +78,9 @@ /*! @brief Combined string with formatted combination of all cFS component versions */ #define CFS_VERSIONS \ -"cFS Versions \n" \ - " cfe: " CFE_SRC_VERSION "\n" \ - " osal: " OS_VERSION "\n" \ - " psp: " /* CFE_PSP_VERSION is defined at runtime */ +"cFS Versions:" \ + " cfe " CFE_SRC_VERSION \ + ", osal " OS_VERSION \ + ", psp " /* CFE_PSP_VERSION is defined at runtime */ #endif /* _cfe_version_ */ diff --git a/fsw/cfe-core/src/tbl/cfe_tbl_task.c b/fsw/cfe-core/src/tbl/cfe_tbl_task.c index 792917cba..d1b4ffa59 100644 --- a/fsw/cfe-core/src/tbl/cfe_tbl_task.c +++ b/fsw/cfe-core/src/tbl/cfe_tbl_task.c @@ -214,7 +214,7 @@ int32 CFE_TBL_TaskInit(void) /* ** Task startup event message */ - Status = CFE_EVS_SendEvent(CFE_TBL_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "cFE TBL Initialized.\n%s", CFE_VERSION_STRING); + Status = CFE_EVS_SendEvent(CFE_TBL_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "cFE TBL Initialized.%s", CFE_VERSION_STRING); if(Status != CFE_SUCCESS) { diff --git a/fsw/cfe-core/src/time/cfe_time_task.c b/fsw/cfe-core/src/time/cfe_time_task.c index 98fb4cf47..b1e0f16f9 100644 --- a/fsw/cfe-core/src/time/cfe_time_task.c +++ b/fsw/cfe-core/src/time/cfe_time_task.c @@ -815,7 +815,7 @@ int32 CFE_TIME_NoopCmd(const CFE_TIME_Noop_t *data) CFE_TIME_TaskData.CommandCounter++; CFE_EVS_SendEvent(CFE_TIME_NOOP_EID, CFE_EVS_EventType_INFORMATION, - "No-op command. %s", CFE_VERSION_STRING); + "No-op command.%s", CFE_VERSION_STRING); return CFE_SUCCESS;