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

Fix #746, CMake mission dependency cleanup #751

Merged

Commits on Jun 10, 2020

  1. Merge pull request nasa#729 from nasa/integration-candidate

    Integration Candidate: 2020-05-27
    astrogeco authored Jun 10, 2020
    Configuration menu
    Copy the full SHA
    ad2190a View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2020

  1. Merge pull request nasa#743 from nasa/integration-candidate

    Integration Candidate: 2020-06-10
    astrogeco authored Jun 17, 2020
    Configuration menu
    Copy the full SHA
    1df042b View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2020

  1. Merge pull request nasa#756 from nasa/integration-candidate

    Integration Candidate: 2020-06-17
    astrogeco authored Jun 25, 2020
    Configuration menu
    Copy the full SHA
    84ec281 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2020

  1. Fix nasa#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 committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    2caa7de View commit details
    Browse the repository at this point in the history
  2. Fix nasa#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 committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    ed37cda View commit details
    Browse the repository at this point in the history
  3. Fix nasa#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 committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    09cbe08 View commit details
    Browse the repository at this point in the history