From 44932c3940a15b415fd58d1eab76ea061b43472c Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Tue, 25 Oct 2022 16:34:08 -0400 Subject: [PATCH 1/2] Fix #2183, use osal_public_api header targets in doc Ensure that `osal_public_api_headerlist` is a dependency of all the doc builds. Also adds the OSAL top level directory to the mission build which will define the `osal_public_api` target, and thus not require the path to be repeated. --- cmake/mission_build.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/mission_build.cmake b/cmake/mission_build.cmake index 8dcc63f32..3494ad204 100644 --- a/cmake/mission_build.cmake +++ b/cmake/mission_build.cmake @@ -322,12 +322,12 @@ function(prepare) WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/docs/cfe-usersguide") # OSAL API GUIDE include PUBLIC API - set(OSAL_API_INCLUDE_DIRECTORIES - "${osal_MISSION_DIR}/src/os/inc" - "${CMAKE_BINARY_DIR}/docs" - ) + add_subdirectory(${osal_MISSION_DIR} osal_public_api) add_subdirectory(${osal_MISSION_DIR}/docs/src ${CMAKE_BINARY_DIR}/docs/osal-apiguide) + add_dependencies(cfe-usersguide osal_public_api_headerlist) + add_dependencies(mission-doc osal_public_api_headerlist) + # Pull in any application-specific mission-scope configuration # This may include user configuration files such as cfe_mission_cfg.h, # msgid definitions, or any other configuration/preparation that needs to From f0f6c21bac3240845d777b094d3a1a46e549b376 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 26 Oct 2022 10:17:15 -0400 Subject: [PATCH 2/2] Bump to v7.0.0-rc4+dev201 --- 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 1e4bb6da9..4f6453039 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: v7.0.0-rc4+dev201 +- use osal_public_api header targets in doc +- See + ## Development Build: v7.0.0-rc4+dev197 - Remove Changelog in Doxygen Config - See diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index 66b9fc3bc..9346c196a 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 197 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */ +#define CFE_BUILD_NUMBER 201 /**< @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 */