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

Resolve #531, Add baseline and build number #536

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jul 8, 2020

Describe the contribution
Resolve #531

Testing performed
Bundle CI
Docker-based testing using gcc image

Expected behavior changes
New macros defined. No changes on it's own. When combined with nasa/cFE#771 and nasa/PSP#178 then startup reporting looks like
Screen Shot 2020-07-15 at 8 56 43 AM
Screen Shot 2020-07-15 at 8 56 52 AM
Screen Shot 2020-07-15 at 8 56 35 AM

System(s) tested on
Ubuntu

Additional context
Left in a commented-out section for replacing the version string for official releases.

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Gerardo E. Cruz-Ortiz, NASA-GSFC

@astrogeco astrogeco force-pushed the 531-add-baseline-and-build-number branch 2 times, most recently from 4246696 to 811ee54 Compare July 8, 2020 16:19
@astrogeco astrogeco closed this Jul 14, 2020
@astrogeco astrogeco deleted the 531-add-baseline-and-build-number branch July 14, 2020 15:42
@astrogeco astrogeco restored the 531-add-baseline-and-build-number branch July 15, 2020 03:06
@astrogeco astrogeco reopened this Jul 15, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate July 15, 2020 03:11
@astrogeco astrogeco force-pushed the 531-add-baseline-and-build-number branch 2 times, most recently from 0a54c06 to 0f22a8b Compare July 15, 2020 03:48
@astrogeco astrogeco marked this pull request as ready for review July 15, 2020 15:54
@astrogeco astrogeco force-pushed the 531-add-baseline-and-build-number branch 5 times, most recently from e34f210 to 79ecdfc Compare July 17, 2020 18:57
Add build number and baseline macros
Add codename to version string
Add macro for version strings
@astrogeco astrogeco force-pushed the 531-add-baseline-and-build-number branch from 79ecdfc to dadf842 Compare July 17, 2020 18:59
@astrogeco astrogeco merged commit 2b47fd0 into nasa:integration-candidate Jul 17, 2020
@skliper skliper added this to the 5.1.0 milestone Aug 21, 2020
@astrogeco astrogeco deleted the 531-add-baseline-and-build-number branch July 7, 2021 15:21
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
NOTE - Comments/documentation only, no logic updates
Also fixes nasa#403, resolves all warnings
Also fixes nasa#536, comment typo in CFE_SB_RcvMsg implementation header
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.

Add build number and codename to version.h
2 participants