Fix #22: Clean up elf2cfetbl build logic#24
Merged
Conversation
Remove the now-unnecessary inclusion of CFE TBL internal definitions. All logic in this tool is based on public include files only. CFE ensures that the header sizes are always a multiple of 4 bytes, so the logic to selectively byte-align is unnecessary. CFE now requires this to be 4-byte aligned. Clean up all hacks in the CMake recipe, the build is now much more straightforward when internal headers aren't being used.
skliper
approved these changes
Oct 9, 2019
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
2 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.
Remove the now-unnecessary inclusion of CFE TBL internal definitions.
All logic in this tool is based on public include files only.
CFE ensures that the header sizes are always a multiple of 4 bytes,
so the logic to selectively byte-align is unnecessary. CFE now
requires this to be 4-byte aligned.
Clean up all hacks in the CMake recipe, the build is now much
more straightforward when internal headers aren't being used.
Describe the contribution
Fixes issue #22, cleans up the build process for this tool.
IMPORTANT - This depends on nasa/cFE#27 and cannot be merged/tested prior to this being merged. This can only be cleaned up on this side once it is ensured that the internal CFE_TBL definitions are no longer required here.
Note this also removes the
-noption to the tool, as nasa/cFE#27 now guarantees this to be 4-byte aligned through the use of compile-time checks. It is not possible for this option to do anything, and the code that implemented this option was depending on a symbol that was no longer available, so it was easiest and cleanest to just prune it out.Testing performed
Rebuild code with sample table definitions. Table is built successfully.
Expected behavior changes
No impact to behavior
System(s) tested on:
Ubuntu 18.04.2, 64-bit
Contributor Info
Joseph Hickey, Vantage Systems, Inc.
Community contributors
You must attach a signed CLA (required for acceptance) or reference one already submitted