From 0266452ae37a751aab8cb7d75566fd06428b578b Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Tue, 31 Jan 2023 22:34:33 +0100 Subject: [PATCH] iox-#1391 Update used headers and add the new include paths to the script Signed-off-by: Simon Hoinkis --- tools/scripts/list_stl_dependencies.sh | 12 ++++++++++-- tools/scripts/used-headers.txt | 1 - 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/scripts/list_stl_dependencies.sh b/tools/scripts/list_stl_dependencies.sh index f053035a601..0438f12247f 100755 --- a/tools/scripts/list_stl_dependencies.sh +++ b/tools/scripts/list_stl_dependencies.sh @@ -24,7 +24,8 @@ SCOPE=${1:-list} COMPONENTS=(iceoryx_hoofs iceoryx_posh) -SOURCE_DIR=(source include) +POSH_SOURCE_DIR=(source include) +HOOFS_SOURCE_DIR=(source include memory time vocabulary container) WORKSPACE=$(git rev-parse --show-toplevel) QNX_PLATFORM_DIR=$WORKSPACE/iceoryx_platform/qnx/ USELIST=$WORKSPACE/tools/scripts/used-headers.txt @@ -32,9 +33,16 @@ CURRENTLY_USED_HEADERS=$(mktemp) GET_HEADER_NAME="\<\K[^<>]+(?=>)" # Matches the content between angle brackets for COMPONENT in ${COMPONENTS[@]}; do - for DIR in ${SOURCE_DIR[@]}; do +if [[ "$COMPONENT" == "iceoryx_posh" ]]; then + for DIR in ${POSH_SOURCE_DIR[@]}; do GREP_PATH_HOOFS_POSH="${GREP_PATH_HOOFS_POSH} ${WORKSPACE}/${COMPONENT}/$DIR" done +fi +if [[ "$COMPONENT" == "iceoryx_hoofs" ]]; then + for DIR in ${HOOFS_SOURCE_DIR[@]}; do + GREP_PATH_HOOFS_POSH="${GREP_PATH_HOOFS_POSH} ${WORKSPACE}/${COMPONENT}/$DIR" + done +fi done echo "# QNX platform / libc headers" | tee -a $CURRENTLY_USED_HEADERS diff --git a/tools/scripts/used-headers.txt b/tools/scripts/used-headers.txt index 4f5d7c4adc4..bce701ba429 100644 --- a/tools/scripts/used-headers.txt +++ b/tools/scripts/used-headers.txt @@ -47,7 +47,6 @@ map memory mutex new -numeric process.h regex sstream