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

cFE Integration candidate: Caelum-rc4+dev47 #2307

Merged
merged 7 commits into from
Apr 25, 2023
Merged

Conversation

dzbaker
Copy link
Collaborator

@dzbaker dzbaker commented Apr 25, 2023

Checklist (Please check before submitting)

Describe the contribution

Testing performed
cFS Bundle Checks
cFE Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey
@dzbaker

jphickey and others added 7 commits April 19, 2023 23:45
Improves the functionality and adds additional documentation about
how this function is intended to work.  The improvements add some
flexibility and intelligence and should be backward compatible with
existing use cases.

The add_cfe_app() function now adds an additional interface target that
can be referenced when building tables, and this includes the
directory-scope properties from the original app build.  Therefore,
calls to add_cfe_tables from other (non-app) contexts can get the full
set of include directories.

This also makes the target name simpler when adding custom properties,
it is simply "${APP_NAME}.table"

Finally, instead of invoking the table tool (elf2cfetbl) directly in the
context of the table build rule, it generates a custom makefile rule
instead, which is called from the top-level (mission) scope to do the
conversions.
…ing them to the integration-candidate branch.
Update the "generate_config_includefile" to be aware of generated files.
This should not call cfe_locate_implementation_file() in this context
because the file may not exist at the time.  For this type of use case
it should just directly link the file without any checking.
Fix #2296, add option to link to generated files
Fix #2297, Create Workflow for IC Bundle Generation
@dzbaker dzbaker merged commit c9b10f3 into main Apr 25, 2023
@dmknutsen dmknutsen added this to the Equuleus milestone May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants