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 #177, Add baseline and build to version.h #178

Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jul 8, 2020

Describe the contribution
Resolve #177

Testing performed
Steps taken to test the contribution:
Built on top of current integration candidate
Built with other integration candidates as well as with nasa/osal#532 and nasa/cFE#771

Expected behavior changes
New macros defined. No changes on it's own. When combined with nasa/cFE#771 and nasa/osal#532 then startup reporting now 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
Docker Ubuntu-based gcc image on OSX

Additional context
Also Tested with nasa/osal#532 and nasa/cFE#771

Third party code
None

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

@astrogeco astrogeco changed the base branch from master to integration-candidate July 8, 2020 17:06
@astrogeco astrogeco closed this Jul 15, 2020
@astrogeco astrogeco deleted the 177-add-baseline-and-build branch July 15, 2020 02:46
@astrogeco astrogeco restored the 177-add-baseline-and-build branch July 15, 2020 02:47
@astrogeco astrogeco reopened this Jul 15, 2020
@astrogeco astrogeco force-pushed the 177-add-baseline-and-build branch from 2b99e0f to d5603c6 Compare July 15, 2020 04:07
Add new macros for build baseline and number to psp_version.h files
Add new element to PSP configuration structure.
Add new macro CFE_PSP_VERSION in cfe_psp.h
@astrogeco astrogeco force-pushed the 177-add-baseline-and-build branch from d5603c6 to d7f1b49 Compare July 19, 2020 18:55
@astrogeco astrogeco merged commit f194bc2 into nasa:integration-candidate Jul 19, 2020
@astrogeco
Copy link
Contributor Author

@skliper and @jphickey I ended up adding an element to CFE_PSP_VersionInfo_t to fix the problem I had with the PSP version string. I already merged this but it's still in the integration-candidate branch so we can fix it up a bit if this breaks anything.

@skliper skliper added this to the 1.5.0 milestone Aug 21, 2020
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 name and Build number to version.h
2 participants