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 #2289, implement common search routine for config files #2290

Merged
merged 1 commit into from
Apr 13, 2023

Conversation

jphickey
Copy link
Contributor

Checklist (Please check before submitting)

Describe the contribution
Adds a 'cfe_locate_implementation_file()' function that provides a consistent means to find a file within the ${MISSION_DEFS} subdirectory.

Similar locate/search logic was necessary in a few places, for generate_config_includefile as well as add_cfe_tables, but these were not consistent in the paths or ordering used. Using this function should make them consistent.

Fixes #2289

Testing performed
Confirm that the new file matching routine finds the same file as the old logic did

Expected behavior changes
More flexibility with generate_config_includefile()

System(s) tested on
Debian

Additional context
Currently this PR only employs the new logic for generate_config_includefile(). Separate PRs will switch add_cfe_tables() and any other logic used to search for other files.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Adds a 'cfe_locate_implementation_file()' function that provides a
consistent means to find a file within the ${MISSION_DEFS} subdirectory.

Similar locate/search logic was necessary in a few places, for
generate_config_includefile as well as add_cfe_tables, but these were
not consistent in the paths or ordering used.  Using this function
should make them consistent.
@jphickey jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Apr 13, 2023
@jphickey
Copy link
Contributor Author

Follow-on work (assuming this can get merged in next cycle) would be to fix up these other search loops to use the same function:

foreach(INSTFILE ${${TGTNAME}_FILELIST})

if(EXISTS ${MISSION_DEFS}/${TGTNAME}_${EMBFILE})

if (EXISTS "${MISSION_DEFS}/tables/${TGT}_${TBLWE}.c")

The last one (for add_cfe_tables) will be fixed as part of what I'm working on for #2284 ...

@dzbaker dzbaker added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Apr 13, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 13, 2023
*Combines:*

cFE v7.0.0-rc4+dev268
sch_lab v2.5.0-rc4+dev53
to_lab v2.5.0-rc4+dev45

**Includes:**

*cFE*
- nasa/cFE#2254
- nasa/cFE#2288
- nasa/cFE#2290

*sch_lab*
- nasa/sch_lab#136

*to_lab*
- nasa/to_lab#139

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
@dzbaker dzbaker merged commit ddddd17 into nasa:main Apr 13, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Apr 13, 2023
*Combines:*

cFE v7.0.0-rc4+dev268
sch_lab v2.5.0-rc4+dev53
to_lab v2.5.0-rc4+dev45

**Includes:**

*cFE*
- nasa/cFE#2254
- nasa/cFE#2288
- nasa/cFE#2290

*sch_lab*
- nasa/sch_lab#136

*to_lab*
- nasa/to_lab#139

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
@jphickey jphickey deleted the fix-2289-common-search branch April 17, 2023 15:17
@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
Labels
CCB:Approved Indicates code review and approval by community CCB enhancement Equuleus-rc1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inconsisent search paths used for mission-provided files
4 participants