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

HOTFIX #318, Standardize versioning information #329

Merged
merged 1 commit into from
Mar 25, 2022
Merged

HOTFIX #318, Standardize versioning information #329

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
15 changes: 8 additions & 7 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 @@ -30,20 +30,21 @@
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 14
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc1"
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
* Version Macro Definitions
* Version Macros, see \ref cfsversions for definitions.
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define CFE_PSP_IMPL_MINOR_VERSION 4 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define CFE_PSP_IMPL_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
#define CFE_PSP_IMPL_MAJOR_VERSION 1 /**< @brief Major version number */
#define CFE_PSP_IMPL_MINOR_VERSION 4 /**< @brief Minor version number */
#define CFE_PSP_IMPL_REVISION 99 /**< @brief Revision version number. Value of 99 indicates a development version.*/

/*!
* @brief Mission revision.
*
* Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
* Values 1-254 are reserved for mission use to denote patches/customizations as needed.
* Reserved for mission use to denote patches/customizations as needed.
* Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
* cFS open-source development use (pending resolution of nasa/cFS#440)
*/
#define CFE_PSP_IMPL_MISSION_REV 0xFF

Expand Down
15 changes: 8 additions & 7 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 @@ -30,20 +30,21 @@
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 14
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc1"
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
* Version Macro Definitions
* Version Macros, see \ref cfsversions for definitions.
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define CFE_PSP_IMPL_MINOR_VERSION 4 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define CFE_PSP_IMPL_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
#define CFE_PSP_IMPL_MAJOR_VERSION 1 /**< @brief Major version number */
#define CFE_PSP_IMPL_MINOR_VERSION 4 /**< @brief Minor version number */
#define CFE_PSP_IMPL_REVISION 99 /**< @brief Revision version number. Value of 99 indicates a development version.*/

/*!
* @brief Mission revision.
*
* Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
* Values 1-254 are reserved for mission use to denote patches/customizations as needed.
* Reserved for mission use to denote patches/customizations as needed.
* Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
* cFS open-source development use (pending resolution of nasa/cFS#440)
*/
#define CFE_PSP_IMPL_MISSION_REV 0xFF

Expand Down
15 changes: 8 additions & 7 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 @@ -30,20 +30,21 @@
* Development Build Macro Definitions
*/
#define CFE_PSP_IMPL_BUILD_NUMBER 14
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc1"
#define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4"

/*
* Version Macro Definitions
* Version Macros, see \ref cfsversions for definitions.
*/
#define CFE_PSP_IMPL_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */
#define CFE_PSP_IMPL_MINOR_VERSION 4 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */
#define CFE_PSP_IMPL_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */
#define CFE_PSP_IMPL_MAJOR_VERSION 1 /**< @brief Major version number */
#define CFE_PSP_IMPL_MINOR_VERSION 4 /**< @brief Minor version number */
#define CFE_PSP_IMPL_REVISION 99 /**< @brief Revision version number. Value of 99 indicates a development version.*/

/*!
* @brief Mission revision.
*
* Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
* Values 1-254 are reserved for mission use to denote patches/customizations as needed.
* Reserved for mission use to denote patches/customizations as needed.
* Values 1-254 are reserved for mission use to denote patches/customizations as needed. NOTE: Reserving 0 and 0xFF for
* cFS open-source development use (pending resolution of nasa/cFS#440)
*/
#define CFE_PSP_IMPL_MISSION_REV 0xFF

Expand Down