Fix #1436, table object file name#1437
Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom May 11, 2021
Merged
Conversation
Contributor
Author
|
Marking this as draft for now, need coordination w/ @klystron78 to test this on the VxWorks7 build where the issue was observed |
jphickey
added
the
CCB:Ready
Contributor
|
CCB:2021-05-05 APPROVED
|
astrogeco
added
the
CCB:Approved
Contributor
|
@jphickey is this ready? |
This uses a sub-script to call elf2cfetbl which avoid relying on a shell glob. More complicated but should be more robust if/when someone renames a table. Note: A proper/simpler fix would still be to use TARGET_OBJECTS generator expression, but that can't happen until Ubuntu 18.04 (w/ ver 3.10) or older versions are no longer supported.
jphickey
force-pushed
the
fix-1436-tbl-filename
branch
from
fce8a92 to
73fc3d6
Compare
Contributor
Author
|
Rebased and consolidated to single commit with second version as discussed in CCB, should be good to merge now. |
astrogeco
added
IC:2021-05-11
and removed
CCB:Ready
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Describe the contribution
Use a shell glob instead of assuming a specific file name, this should pick up the object file no matter how it was named, as
long as it ends in ${CMAKE_C_OUTPUT_EXTENSION}.
It does rely on/assume there is only one such file, so this might break if one changes the name of a table without a clean rebuild.
A proper fix would still be to use TARGET_OBJECTS generator expression, but that can't happen until Ubuntu 18.04 (w/ ver 3.10) is EOL.
Fixes #1436
Testing performed
Build and sanity check CFE, confirm tables are built successfully
Expected behavior changes
Tables should build even if the file name pattern is not as expected.
System(s) tested on
Ubuntu 20.04
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.