Integration Candidate: Fast Track #672
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rather than CFE generating an osconfig.h file directly, it just needs to select file(s) from the defs directory and pass them to OSAL for the config.
Fix #652, cmake-based OSAL config
This replaces native_osconfig.h and enables running UT as a normal user when SIMULATION=native. Travis-CI requires this.
The osconfig.h file is now generated rather than as a normal header file in the source tree. A path must be included to resolve refs in doxygen.
Generate an osconfig.h specially for doxygen, independently of the file actually used for the build.
|
See https://github.com/skliper/cFE/tree/ic-doxygen-update for direct doxygen of the osconfig.h.in. Don't need the example file creation. |
|
Note make prep also is now failing in integration-candidate again. |
|
Standby... travis is not reporting errors correctly... |
|
@astrogeco went down the rabbit hole of using the osconfig.h.in, which can be made to work but it ended up with more custom file extensions/extension mapping, etc that felt like more complex than just using the method @jphickey implemented. I vote just move forward with this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the contribution
Fixes #652
Testing performed
See #667
Bundle CI - https://github.com/nasa/cFS/pull/78/checks?check_run_id=644721591
Expected behavior changes
Users must now select OSAL options via the CMake file in their defs directory, rather than the osconfig.h file.
System(s) tested on
See PR
Bundle CI - Ubuntu:Bionic
Additional context
Part of nasa/cFS#78
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.