From 44eac09ea0bfc75cf3d0a03fa8b5fbcd33d73b87 Mon Sep 17 00:00:00 2001 From: ArielSAdamsNASA Date: Tue, 11 Oct 2022 08:59:49 -0500 Subject: [PATCH 1/2] Fix #2164, Remove Changelog in Doxygen Config --- cmake/cfe-common.doxyfile.in | 7 +++++++ cmake/mission-doc.doxyfile.in | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/cfe-common.doxyfile.in b/cmake/cfe-common.doxyfile.in index c620a3795..0c752b606 100644 --- 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 index 203e4f24a..46f331a3f 100644 --- 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" From adb4782f11ade36c71c509282cccff8d16c210d8 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 17 Oct 2022 10:51:00 -0400 Subject: [PATCH 2/2] Bump to v7.0.0-rc4+dev197 --- CHANGELOG.md | 4 ++++ modules/core_api/fsw/inc/cfe_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e194ee83..1e4bb6da9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: v7.0.0-rc4+dev197 +- Remove Changelog in Doxygen Config +- See + ## 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/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index 85034e398..66b9fc3bc 100644 --- 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 */