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.

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

Integration Candidate: 2020-06-24 #765

Merged
merged 14 commits into from
Jul 26, 2020
Merged

Integration Candidate: 2020-06-24 #765

merged 14 commits into from
Jul 26, 2020

Commits on Jul 26, 2020

  1. Fix #739, add global module list and mission default file

    Add more hooks for additional flexibility when adding
    modular code blobs into the build.
    
    Three new directives are added:
    
    MISSION_CORE_MODULES, for modular components which are
    direct dependencies of CFE core and/or extend its functionality.
    
    MISSION_GLOBAL_APPLIST, for applications/libraries which
    should be built for every target, as if they were listed
    in every TGTx_APPLIST setting.
    
    MISSION_GLOBAL_STATIC_APPLIST, same as above but for the
    TGTx_STATIC_APPLIST setting.
    
    This also simplifies/reworks the search path to remove
    some logic that was never really utilized.
    jphickey authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    4dc0329 View commit details
    Browse the repository at this point in the history
  2. Fix #724, implement config-based target builds

    The existing build system built target executables grouped by toolchain
    as a proxy for CPU architecture + machine options/flags.  The app binaries
    would be built once and copied to any/all targets sharing that toolchain.
    
    The side effect of doing this is that the application needs to be written
    in an CPU-agnostic manner, performing its subscriptions and configurations
    from runtime table data rather than hardcoded/fixed values.  Unfortunately
    most apps are not coded that way, so workarounds were needed.
    
    This changes the top level process to include the "platform" within this
    target build logic, effectively treating different platform configs as
    entirely different builds, even if they share the same toolchain file.
    
    As a result, binaries will only be shared between targets that explicitly
    set the "TGTx_PLATFORM" setting in targets.cmake to the same value.
    jphickey authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    05eb82a View commit details
    Browse the repository at this point in the history
  3. Fix #746, simplify dependency handling

    Put more dependencies into the "mission_defaults.cmake" file for
    more visibility and ease of configuration.  This now includes all
    "implicit" modules such as cfe-core, osal, and psp.
    
    Also push the calls to "generate_config_includefile" to a sub-script
    which can be distributed with each app and evaluated as part of the
    build.  This reduces dependencies on special naming conventions like
    "fsw/mission_inc" and "fsw/platform_inc", and apps can explicitly manage
    the files that users are expected to override.
    jphickey authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    aea76b9 View commit details
    Browse the repository at this point in the history
  4. Fix #747, CFE_SB_TimeStampMsg in does not record MsgPtr argument value

    In ut_sb_stubs.c, update CFE_SB_TimeStampMsg  to save the message
    pointer argument with UT_Stub_CopyFromLocal so that unit tests can check
    it
    asgibson authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    68e9655 View commit details
    Browse the repository at this point in the history
  5. Fix #762, scrub of all CFE UT stub functions

    Scrubs all CFE unit test functions to ensure that:
    
    1. All functions in the CFE public API have a stub function implemented
    2. All parameters to the stub function are registered in the context object,
       so the values will be available to hook functions.
    3. The names of all parameters match the prototype/documentation, so hook
       functions that use name-based argument value retrieval will work.
    jphickey authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    43bbb74 View commit details
    Browse the repository at this point in the history
  6. HOTFIX: correct computation of OSAL_CONFIGURATION_FILE

    Now that TARGETSYSTEM is a list, it needs to do a foreach
    on each list component to work the same as it did before.
    jphickey authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    03b5343 View commit details
    Browse the repository at this point in the history
  7. Fix #752, use OS_READ_ONLY, not O_RDONLY

    Calls to OS_open() must use the OSAL-defined symbol, not the POSIX symbol.
    This was a long-standing bug but happened to work because they are both
    zero.
    jphickey authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    609f4b4 View commit details
    Browse the repository at this point in the history
  8. Fix 766, Add to table search path

    skliper authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    2093561 View commit details
    Browse the repository at this point in the history
  9. HOTFIX: confirm that MISSION_DIR is set for all dependencies

    Adding a subdirectory with an empty/undefined string is interpreted
    as the current directory, which ends up triggering an infinite loop.
    
    This can occur if the variables/lists were modified in an unexpected
    manner.
    jphickey authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    0575115 View commit details
    Browse the repository at this point in the history
  10. Fix #774, trigger error if no include files found

    Report an error if no files are available to fulfill an
    include file requirement, rather than leaving an empty file.
    jphickey authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    187adb2 View commit details
    Browse the repository at this point in the history
  11. Fix #710, allow setting of processor ID in targets.cmake

    Add support for a TGTx_PROCESSOR_ID directive, which allows
    one to set the default value returned by CFE_PSP_GetProcessorId()
    function, rather than assuming the index value from CMake.
    jphickey authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    9a5b2a9 View commit details
    Browse the repository at this point in the history
  12. Resolve #770, Add baseline and build number (#771)

    Update Version Numbers description to remove statement on Revision number increases with development build
    Add description for build name and build number.
    
    Add buildnumber macro
    Add CFE_VERSION
    Add CFE_VERSION_STRING macro
    Use CFE_VERSION to event messages for different services
    Check for OSAL_VERSION and CFE_PSP_VERSION macros and populate them with version numbers if they don't exist.
    Add CFS_VERSIONS macro
    
    Use new version string in event messages
    
    Use new macros in evs and tbl startup events
    astrogeco authored and Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    ca77c53 View commit details
    Browse the repository at this point in the history
  13. HOTFIX IC-20200624, Move version documentation to doxygen file and ot…

    …her fixes
    
    Moved documentation and version code template from cfe_version.h to
    cfs_versions.dox
    
    Rename CFE_VERSION to CFE_SRC_VERSION to avoid conflict with cmake-generated git-based enhanced versioning.
    
    Fix doxygen comment structure error.
    Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    ed0d59f View commit details
    Browse the repository at this point in the history
  14. Increase build number to 289 and update Readme

    Gerardo E. Cruz-Ortiz committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    343f60d View commit details
    Browse the repository at this point in the history