Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration Candidate: Fast Track #672

Merged
merged 5 commits into from
May 5, 2020
Merged

Integration Candidate: Fast Track #672

merged 5 commits into from
May 5, 2020

Commits on May 4, 2020

  1. Fix #652, cmake-based OSAL config 

    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.
    @jphickey
    jphickey committed May 4, 2020
    Configuration menu
    Copy the full SHA
    677a9f8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #667 from jphickey/fix-652-osal-config 

    Fix #652, cmake-based OSAL config
    @astrogeco
    astrogeco authored May 4, 2020
    Configuration menu
    Copy the full SHA
    330e150 View commit details
    Browse the repository at this point in the history

  3. Update Pull #667, add native_osconfig.cmake 

    This replaces native_osconfig.h and enables running UT as a
normal user when SIMULATION=native.  Travis-CI requires this.
    @jphickey
    jphickey committed May 4, 2020
    Configuration menu
    Copy the full SHA
    4fba145 View commit details
    Browse the repository at this point in the history

  4. Update Pull #667, Add doxygen reference to osconfig.h 

    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.
    @jphickey
    jphickey committed May 4, 2020
    Configuration menu
    Copy the full SHA
    cad799c View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

  1. Update Pull #667, Create osconfig.h file for doxygen 

    Generate an osconfig.h specially for doxygen, independently
of the file actually used for the build.
    @jphickey
    jphickey committed May 5, 2020
    Configuration menu
    Copy the full SHA
    d9730b5 View commit details
    Browse the repository at this point in the history