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.

Sign up for GitHub

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

Jump to bottom

Resolve #177, Add baseline and build to version.h #178

Merged
merged 1 commit into from
Jul 19, 2020
Merged

Resolve #177, Add baseline and build to version.h #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions fsw/inc/cfe_psp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,13 @@
#define CFE_PSP_RST_SUBTYPE_MAX 10 /**< \brief Placeholder to indicate 1+ the maximum value that the PSP will ever use. */
/** \} */


/* Implement the "version" macros */
#define CFE_PSP_MAJOR_VERSION (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.MajorVersion)
#define CFE_PSP_MINOR_VERSION (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.MinorVersion)
#define CFE_PSP_REVISION (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.Revision)
#define CFE_PSP_MISSION_REV (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.MissionRev)
#define CFE_PSP_VERSION (GLOBAL_PSP_CONFIGDATA.PSP_VersionInfo.Version)

/*
** Type Definitions
Expand Down
1 change: 1 addition & 0 deletions fsw/inc/cfe_psp_configdata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ typedef const struct
uint8 MinorVersion;
uint8 Revision;
uint8 MissionRev;
char Version[16];
} CFE_PSP_VersionInfo_t;


Expand Down
61 changes: 50 additions & 11 deletions fsw/mcp750-vxworks/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,62 @@
*/

/*
** File: psp_version.h
**
** Purpose:
** Provide version identifiers for the cFE Platform Support Packages (PSP).
**
*/
* File: psp_version.h
*
* Purpose:
* Provide version identifiers for the cFE Platform Support Packages (PSP).
* See cfe documentation for version and build number descriptions
*
*/

#ifndef _psp_version_
#define _psp_version_

/* Development Build Macro Definitions */
#define CFE_PSP_IMPL_BUILD_NUMBER 68
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.4.0+dev"

/*
** Macro Definitions
* Macro Definitions
* ONLY APPLY for OFFICIAL releases
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 0
#define CFE_PSP_IMPL_MISSION_REV 0

#define CFE_PSP_IMPL_STR_HELPER(x) #x
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x)

/* Baseling git tag + Number of commits since baseline */
#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)

#define CFE_PSP_IMPL_VERSION_STRING \
" PSP Development Build\n " CFE_PSP_IMPL_VERSION " (Codename: Bootes)" /* Codename for current development */ \
"\n Last Official Release: psp v1.4.0" /* For full support please use this version */

/* Use the following templates for Official Releases ONLY */

/* Official Release format for CFE_PSP_IMPLVERSION */
/*
#define CFE_PSP_IMPL_VERSION "v" \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MAJOR_VERSION) "." \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MINOR_VERSION) "." \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_REVISION) "." \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MISSION_REV)
*/

/* Official Release CFE_PSP_IMPLVERSION_STRING Format */
/*
#define CFE_PSP_IMPL_VERSION_STRING " PSP " CFE_PSP_IMPL_VERSION
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 14
#define CFE_PSP_IMPL_MISSION_REV 0


/* Official Release CFE_PSP_IMPLVERSION_STRING Format */
/*
#define CFE_PSP_IMPL_VERSION_STRING " PSP " CFE_PSP_IMPLVERSION
*/

/* END TEMPLATES */

#endif /* _psp_version_ */
57 changes: 45 additions & 12 deletions fsw/pc-linux/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,56 @@
*/

/*
** File: psp_version.h
**
** Purpose:
** Provide version identifiers for the cFE Platform Support Packages (PSP).
**
*/
* File: psp_version.h
*
* Purpose:
* Provide version identifiers for the cFE Platform Support Packages (PSP).
* See cfe documentation for version and build number descriptions
*
*/

#ifndef _psp_version_
#define _psp_version_

/* Development Build Macro Definitions */
#define CFE_PSP_IMPL_BUILD_NUMBER 68
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.4.0+dev"

/*
** Macro Definitions
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 14
#define CFE_PSP_IMPL_MISSION_REV 0
* Macro Definitions
* ONLY APPLY for OFFICIAL releases
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 0
#define CFE_PSP_IMPL_MISSION_REV 0

#define CFE_PSP_IMPL_STR_HELPER(x) #x
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x)

/* Baseling git tag + Number of commits since baseline */
#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)

#define CFE_PSP_IMPL_VERSION_STRING \
" PSP Development Build\n " CFE_PSP_IMPL_VERSION " (Codename: Bootes)" /* Codename for current development */ \
"\n Last Official Release: psp v1.4.0" /* For full support please use this version */

/* Use the following templates for Official Releases ONLY */

/* Official Release format for CFE_PSP_IMPLVERSION */
/*
#define CFE_PSP_IMPL_VERSION "v" \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MAJOR_VERSION) "." \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MINOR_VERSION) "." \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_REVISION) "." \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MISSION_REV)
*/

/* Official Release CFE_PSP_IMPLVERSION_STRING Format */
/*
#define CFE_PSP_IMPL_VERSION_STRING " PSP " CFE_PSP_IMPL_VERSION
*/

/* END TEMPLATES */

#endif /* _psp_version_ */
58 changes: 46 additions & 12 deletions fsw/pc-rtems/inc/psp_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,57 @@
*/

/*
** File: psp_version.h
**
** Purpose:
** Provide version identifiers for the cFE Platform Support Packages (PSP).
**
*/
* File: psp_version.h
*
* Purpose:
* Provide version identifiers for the cFE Platform Support Packages (PSP).
* See cfe documentation for version and build number descriptions
*
*/

#ifndef _psp_version_
#define _psp_version_

/* Development Build Macro Definitions */
#define CFE_PSP_IMPL_BUILD_NUMBER 68
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.4.0+dev"

/*
** Macro Definitions
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 14
#define CFE_PSP_IMPL_MISSION_REV 0
* Macro Definitions
* ONLY APPLY for OFFICIAL releases
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1
#define CFE_PSP_IMPL_MINOR_VERSION 4
#define CFE_PSP_IMPL_REVISION 0
#define CFE_PSP_IMPL_MISSION_REV 0

#define CFE_PSP_IMPL_STR_HELPER(x) #x
#define CFE_PSP_IMPL_STR(x) CFE_PSP_IMPL_STR_HELPER(x)

/* Baseling git tag + Number of commits since baseline */
#define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)

#define CFE_PSP_IMPL_VERSION_STRING \
" PSP Development Build\n " CFE_PSP_IMPL_VERSION " (Codename: Bootes)" /* Codename for current development */ \
"\n Last Official Release: psp v1.4.0" /* For full support please use this version */

/* Use the following templates for Official Releases ONLY */

/* Official Release format for CFE_PSP_IMPLVERSION */
/*
#define CFE_PSP_IMPL_VERSION "v" \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MAJOR_VERSION) "." \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MINOR_VERSION) "." \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_REVISION) "." \
CFE_PSP_IMPL_STR(CFE_PSP_IMPL_MISSION_REV)
*/

/* Official Release CFE_PSP_IMPLVERSION_STRING Format */
/*
#define CFE_PSP_IMPL_VERSION_STRING " PSP " CFE_PSP_IMPL_VERSION
*/


/* END TEMPLATES */

#endif /* _psp_version_ */
3 changes: 2 additions & 1 deletion fsw/shared/src/cfe_psp_configdata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Target_PspConfigData GLOBAL_PSP_CONFIGDATA =
.MajorVersion = CFE_PSP_IMPL_MAJOR_VERSION,
.MinorVersion = CFE_PSP_IMPL_MINOR_VERSION,
.Revision = CFE_PSP_IMPL_REVISION,
.MissionRev = CFE_PSP_IMPL_MISSION_REV
.MissionRev = CFE_PSP_IMPL_MISSION_REV,
.Version = CFE_PSP_IMPL_VERSION
}
};