Merge pull request #2171 from nasa/integration-candidate

cFE Integration candidate: Caelum-rc4+dev26
nasa · Oct 17, 2022 · be88a07 · be88a07
2 parents f0703a7 + adb4782
commit be88a07
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v7.0.0-rc4+dev197
+- Remove Changelog in Doxygen Config
+- See <https://github.com/nasa/cFE/pull/2165>
+
 ## Development Build: v7.0.0-rc4+dev193
 - Remove redundant/inconsistent comments (/* end of function */, /* end if */ etc.) and clean up empty lines.
 - Update TO_LAB entry point in cfe_es_startup.scr

diff --git a/cmake/cfe-common.doxyfile.in b/cmake/cfe-common.doxyfile.in
@@ -56,3 +56,10 @@ STRIP_FROM_PATH += @MISSION_SOURCE_DIR@
 @INCLUDE = @MISSION_SOURCE_DIR@/cfe/docs/src/mnem_maps/cfe_evs_tlm_mnem_map
 @INCLUDE = @MISSION_SOURCE_DIR@/cfe/docs/src/mnem_maps/cfe_sb_cmd_mnem_map
 @INCLUDE = @MISSION_SOURCE_DIR@/cfe/docs/src/mnem_maps/cfe_sb_tlm_mnem_map
+
+# Exclude repo documentation
+EXCLUDE_PATTERNS += "*/CHANGELOG.md"
+EXCLUDE_PATTERNS += "*/CODE_OF_CONDUCT.md"
+EXCLUDE_PATTERNS += "*/CONTRIBUTING.md"
+EXCLUDE_PATTERNS += "*/README.md"
+EXCLUDE_PATTERNS += "*/SECURITY.md"
diff --git a/cmake/mission-doc.doxyfile.in b/cmake/mission-doc.doxyfile.in
@@ -26,9 +26,3 @@ STRIP_FROM_PATH += @MISSION_DEFS@
 EXCLUDE_PATTERNS += "*/ut-stubs/*"
 EXCLUDE_PATTERNS += "*/ut-coverage/*"
 EXCLUDE_PATTERNS += "*/unit-test*/*"
-
-# Exclude stand alone repo documentation
-EXCLUDE_PATTERNS += "*/CODE_OF_CONDUCT.md"
-EXCLUDE_PATTERNS += "*/CONTRIBUTING.md"
-EXCLUDE_PATTERNS += "*/README.md"
-EXCLUDE_PATTERNS += "*/SECURITY.md"
diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h
@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER 193 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER 197 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
 
 /* See \ref cfsversions for definitions */