Skip to content

Commit

Permalink
Increase version to 6.8.0-rc1+dev13
Browse files Browse the repository at this point in the history
  • Loading branch information
astrogeco committed Aug 19, 2020
1 parent d50028d commit fc8a020
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob

## Version History

### Development Build: 6.8.0-rc1+dev13

- Deprecates `CFE_SB_GetLastSenderId()` API by introducing new `CFE_OMIT_DEPRECATED_6_8` tag
- Documentation update remove deleted requiremements
- Add a new *cfe_assert* module for functional testing by making it possible to load the UT assert object code as a CFE library. These are compiled as separate, independent modules and only loaded on demand. Also includes a draft example for cFE testing, which calls some basic ES AppId functions.
- See <https://github.com/nasa/cFE/pull/816>

### Development Build: 6.7.0+dev292

- Add missing include path to the target/h and wrn/coreip directory.
Expand All @@ -27,7 +34,7 @@ Remove unrelated comment about CEXP (remnant from RTEMS). No more errors about m
- All parameters to the stub function are registered in the context object, so the values will be available to hook functions.
- The names of all parameters match the prototype/documentation, so hook functions that use name-based argument value retrieval will work.
- Adds to table search path in `arch_build.cmake`
- Calls to OS_open() now use the OSAL-defined symbol, not the POSIX symbol.
- Calls to OS_open() now use the OSAL-defined symbol, not the POSIX symbol.
- Defines new macros to report the build number and build baseline and new strings containing the version number of cFE and a combined string with the version number for OSAL, PSP, and CFE.
- Allow explicitly setting of the processor ID in `targets.cmake`. The `TGTx_PROCESSOR_ID` setting will be passed to the final build/link of CFE core as the CPU ID. If unspecified, then the CMake index value is used instead (backward compatible).
- `cmake` now detects conditions where no files were present to fulfill an config include file requirement and reports an error during `make prep` lists the files it checked for rather than generating an empty file.
Expand All @@ -39,7 +46,7 @@ Remove unrelated comment about CEXP (remnant from RTEMS). No more errors about m
- Added cFE User's Guide Reference to README.md
- Removes old license
- See <https://github.com/nasa/cFE/pull/743>

### Development Build: 6.7.20

- SB Unit use of the UT assert framework is closer to original design intent
Expand Down
24 changes: 12 additions & 12 deletions fsw/cfe-core/src/inc/cfe_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@
/*! @file cfe_version.h
* @brief Purpose:
* Provide version identifiers for the cFE core.
*
*
* target_config.h contains extended version information within it.
* This information is generated automatically by the build using
* git to determine the most recent tag and commit id.
*
*
*/
#include <target_config.h>



/* Development Build Macro Definitions */
#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 */
#define CFE_BUILD_NUMBER 13 /*!< Development Build: Number of commits since baseline */
#define CFE_BUILD_BASELINE "v6.8.0-rc1+dev" /*!< Development Build: git tag that is the base for the current development */

/* Version Macro Definitions */

Expand All @@ -48,27 +48,27 @@
#define CFE_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */
#define CFE_STR(x) CFE_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer macros */

/*! @brief Development Build Version Number.
/*! @brief Development Build Version Number.
* @details Baseline git tag + Number of commits since baseline. @n
* See @ref cfsversions for format differences between development and release versions.
*/
#define CFE_SRC_VERSION CFE_BUILD_BASELINE "+dev" CFE_STR(CFE_BUILD_NUMBER)
#define CFE_SRC_VERSION CFE_BUILD_BASELINE "+dev" CFE_STR(CFE_BUILD_NUMBER)

/*! @brief Development Build Version String.
* @details Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n
* See @ref cfsversions for format differences between development and release versions.
*/
* See @ref cfsversions for format differences between development and release versions.
*/
#define CFE_VERSION_STRING \
" cFE DEVELOPMENT BUILD " \
CFE_SRC_VERSION " (Codename: Bootes)" /* Codename for current development */ \
", Last Official Release: cfe v6.7.0" /* For full support please use this version */


/*! @brief OSAL Version Definitions.
/*! @brief OSAL Version Definitions.
* @details Allows for backwards compatibility. @n
* This will be defined by osal in the future
* This will be defined by osal in the future
*/
#ifndef OS_VERSION
#ifndef OS_VERSION
#define OS_VERSION \
CFE_STR(OS_MAJOR_VERSION) "." \
CFE_STR(OS_MINOR_VERSION) "." \
Expand All @@ -81,6 +81,6 @@
"cFS Versions:" \
" cfe " CFE_SRC_VERSION \
", osal " OS_VERSION \
", psp " /* CFE_PSP_VERSION is defined at runtime */
", psp " /* CFE_PSP_VERSION is defined at runtime */

#endif /* _cfe_version_ */

0 comments on commit fc8a020

Please sign in to comment.