From 7a7fadebb37a3dd63951b6c383b73fd485b0fcde Mon Sep 17 00:00:00 2001
From: astrogeco <59618057+astrogeco@users.noreply.github.com>
Date: Tue, 3 Nov 2020 20:00:09 -0500
Subject: [PATCH] Set REVISION to "99" to indicate development version

Indicate unreleased development version by setting revision number to 99 to match cfe and osal. See nasa/cfe#853
---
 fsw/mcp750-vxworks/inc/psp_version.h |  2 +-
 fsw/pc-linux/inc/psp_version.h       |  2 +-
 fsw/pc-rtems/inc/psp_version.h       | 33 ++++++++++++++--------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h
index c46deb7e..77637df6 100644
--- a/fsw/mcp750-vxworks/inc/psp_version.h
+++ b/fsw/mcp750-vxworks/inc/psp_version.h
@@ -38,7 +38,7 @@
 #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_MISSION_REV   0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
+#define CFE_PSP_IMPL_MISSION_REV   99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased development version.  */
 
 /*
  * Tools to construct version string
diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h
index e4e195c5..19ca98bc 100644
--- a/fsw/pc-linux/inc/psp_version.h
+++ b/fsw/pc-linux/inc/psp_version.h
@@ -38,7 +38,7 @@
 #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_MISSION_REV   0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
+#define CFE_PSP_IMPL_MISSION_REV   99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased development version.  */
 
 /*
  * Tools to construct version string
diff --git a/fsw/pc-rtems/inc/psp_version.h b/fsw/pc-rtems/inc/psp_version.h
index 79c2a709..c0fd7e69 100644
--- a/fsw/pc-rtems/inc/psp_version.h
+++ b/fsw/pc-rtems/inc/psp_version.h
@@ -19,17 +19,17 @@
 */
 
 /*! @file pc-rtems/inc/psp_version.h
- *  @brief Purpose: 
- *  @details Provide version identifiers for the cFE Platform Support Packages (PSP).   
+ *  @brief Purpose:
+ *  @details Provide version identifiers for the cFE Platform Support Packages (PSP).
  *  See @ref cfsversions for version and build number and description
  */
 #ifndef _psp_version_
 #define _psp_version_
 
 /*
- * Development Build Macro Definitions 
+ * Development Build Macro Definitions
  */
-#define CFE_PSP_IMPL_BUILD_NUMBER 24
+#define CFE_PSP_IMPL_BUILD_NUMBER   24
 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.5.0-rc1"
 
 /*
@@ -38,26 +38,27 @@
 #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_MISSION_REV   0 /*!< @brief ONLY USED by MISSION Implementations. Mission revision */
+#define CFE_PSP_IMPL_MISSION_REV 99 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision version number. A value of "99" indicates an unreleased development version.  */
 
 /*
  * Tools to construct version string
- */ 
-#define CFE_PSP_IMPL_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer */ 
-#define CFE_PSP_IMPL_STR(x)        CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */
+ */
+#define CFE_PSP_IMPL_STR_HELPER(x) #x /*!< @brief Helper function to concatenate strings from integer */
+#define CFE_PSP_IMPL_STR(x) \
+    CFE_PSP_IMPL_STR_HELPER(x) /*!< @brief Helper function to concatenate strings from integer */
 
-/*! @brief Development Build Version Number. 
+/*! @brief Development Build Version Number.
  *  @details Baseline git tag + Number of commits since baseline. @n
  *  See @ref cfsversions for format differences between development and release versions.
  */
 #define CFE_PSP_IMPL_VERSION CFE_PSP_IMPL_BUILD_BASELINE CFE_PSP_IMPL_STR(CFE_PSP_IMPL_BUILD_NUMBER)
 
 /*! @brief Development Build Version String.
- *  @details Reports the current development build's baseline, number, and name. Also includes a note about the latest official version. @n
- *  See @ref cfsversions for format differences between development and release versions. 
- */     
-#define CFE_PSP_IMPL_VERSION_STRING                                                                      \
-    " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION                /* Codename for current development */ \
-    ", Last Official Release: psp v1.4.0"                        /* For full support please use this version */
+ *  @details Reports the current development build's baseline, number, and name. Also includes a note about the latest
+ * official version. @n See @ref cfsversions for format differences between development and release versions.
+ */
+#define CFE_PSP_IMPL_VERSION_STRING                                                       \
+    " PSP DEVELOPMENT BUILD " CFE_PSP_IMPL_VERSION /* Codename for current development */ \
+    ", Last Official Release: psp v1.4.0"          /* For full support please use this version */
 
-#endif  /* _psp_version_ */
+#endif /* _psp_version_ */