From 17efe3ec44e39525a064a4d500762ad6322d06cb Mon Sep 17 00:00:00 2001 From: Alexandre Agostinho Date: Mon, 29 May 2023 16:10:51 +0200 Subject: [PATCH] modif on doxygen gen --- entrypoint.sh | 6 +++--- generators/doxygen.sh | 19 +++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 73af274..3cee332 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -56,14 +56,14 @@ fi RELATIVE_PATH=$(echo "$DRONE_REPO_OWNER/$DRONE_REPO_NAME/$DEST/" | tr -s "/") -. "$GENERATOR_SCRIPT" -generate "$DOC_DIR" # generates doc using the wanted generator - if [[ -n $BRANCH && ! $DRONE_BRANCH =~ $BRANCH ]]; then echo "ignoring deploy step since current branch doesn't match $BRANCH" exit fi +. "$GENERATOR_SCRIPT" +generate "$DOC_DIR" # generates doc using the wanted generator + SERVER_TARGET="/usr/share/nginx/html/$RELATIVE_PATH" # launches rsync in archive, verbose and compression mode diff --git a/generators/doxygen.sh b/generators/doxygen.sh index 439d297..f115c39 100644 --- a/generators/doxygen.sh +++ b/generators/doxygen.sh @@ -1,18 +1,13 @@ GEN_PATH="/docs/doxygen" -# Generate doxygen. - generate() { - echo "- generating doxygen" - - mkdir -p $GEN_PATH - if [ -f "/drone/src/$1/Doxyfile" ]; - then - cd /drone/src/$1/ && doxygen Doxyfile - else - # Create empty directory for rsync to delete remote content. - rm -Rf $GEN_PATH - mkdir -p $GEN_PATH + if [ ! -f "$1"/Doxyfile ]; then + echo "doxygen generator error : file $1/Doxyfile is missing" >&2 + exit 1 fi + + mkdir -p $GEN_PATH + cd "$1" + (cat Doxyfile; echo -e "OUTPUT_DIRECTORY = \nHTML_OUTPUT = $GEN_PATH") | doxygen - }