From 6cb42c4562c8005ce39ad0890d5ecf42ae33fa8c Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 1 Dec 2021 16:36:53 -0500 Subject: [PATCH] Set build baseline and bump to v1.3.0-rc4+dev3 - Update baseline to cFS-Caleum-rc4: v1.3.0-rc4 - Update mission rev to use 0xFF for development version --- README.md | 5 +++++ fsw/src/sample_lib_version.h | 17 +++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1a1e4f6..668750b 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,11 @@ sample_lib implements SAMPLE_Function, as an example for how to build and link a ## Version History +### Development Build: v1.3.0-rc4+dev3 + +- Update baseline to cFS-Caelum-rc4: v1.3.0-rc4 +- See + ### Development Build: v1.2.0-rc1+dev38 - Implement Coding Standard in CodeQL workflow diff --git a/fsw/src/sample_lib_version.h b/fsw/src/sample_lib_version.h index 4b1d494..64366e5 100644 --- a/fsw/src/sample_lib_version.h +++ b/fsw/src/sample_lib_version.h @@ -32,18 +32,23 @@ /* Development Build Macro Definitions */ -#define SAMPLE_LIB_BUILD_NUMBER 38 /*!< Development Build: Number of commits since baseline */ +#define SAMPLE_LIB_BUILD_NUMBER 3 /*!< Development Build: Number of commits since baseline */ #define SAMPLE_LIB_BUILD_BASELINE \ - "v1.2.0-rc1" /*!< Development Build: git tag that is the base for the current development */ + "v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */ /* Version Macro Definitions */ #define SAMPLE_LIB_MAJOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Major version number. */ #define SAMPLE_LIB_MINOR_VERSION 1 /*!< @brief ONLY APPLY for OFFICIAL releases. Minor version number. */ -#define SAMPLE_LIB_REVISION \ - 99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. Value of "99" indicates an unreleased \ - development version. */ -#define SAMPLE_LIB_MISSION_REV 0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */ +#define SAMPLE_LIB_REVISION 0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number. */ + +/*! + * @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. + */ +#define SAMPLE_LIB_MISSION_REV 0xFF #define SAMPLE_LIB_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer macros */ #define SAMPLE_LIB_STR(x) \