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

Integration Candidate: 2020-06-24 #176

Merged
merged 6 commits into from
Jul 26, 2020
Merged

Integration Candidate: 2020-06-24 #176

merged 6 commits into from
Jul 26, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jul 1, 2020

Describe the contribution
Fix #169

Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/108/checks

Expected behavior changes
PR #172 - Restructure code to make more amicable for rebuilding in a unit test environment. No major changes, primarily just shifting code between locations/headers to support unit testing.

PR #178 - Adds a char element Version to CFE_PSP_VersionInfo_t. Defines new macros for the Build Number and the Build Baseline.

System(s) tested on
Ubuntu - CI

Additional context
Part of nasa/cFS#108

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Gerardo E. Cruz-Ortiz, NASA-GSFC
Joseph Hickey, Vantage Systems, Inc.

jphickey and others added 2 commits June 16, 2020 13:42
Restructure code to make more amicable for rebuilding in a unit test environment.
No major changes, primarily just shifting code between locations/headers to support
unit testing.
@astrogeco astrogeco marked this pull request as ready for review July 6, 2020 14:06
Gerardo E. Cruz-Ortiz and others added 3 commits July 19, 2020 14:54
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
Resolve #177, Add baseline and build to version.h
@astrogeco astrogeco merged commit e54cd35 into master Jul 26, 2020
@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build PSP components as a separate targets
3 participants