Kaydet (Commit) 247cd338 authored tarafından Chris Sherlock's avatar Chris Sherlock Kaydeden (comit) Miklos Vajna

fdo#74013 make makedocs.sh look in correct project header directories

At the moment, project headers can be either in $PROJECT/inc or
include/$PROJECT. I believe it is possible for them to be in both
locations. Unfortunately, we check for both areas, and doxygen spits
out an error.

Fix is to check if the header directory exists, only use it if it does.

Change-Id: I2e59d8ce0028c20b7d239dcc6e07792edf7078d1
Reviewed-on: https://gerrit.libreoffice.org/7631Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst b7ad3991
...@@ -157,7 +157,17 @@ DOXYGEN_REF_TAGFILES="" ...@@ -157,7 +157,17 @@ DOXYGEN_REF_TAGFILES=""
for PROJECT in $INPUT_PROJECTS; for PROJECT in $INPUT_PROJECTS;
do do
# avoid processing of full project subdirs, only add source and inc # avoid processing of full project subdirs, only add source and inc
DOXYGEN_INPUT=`printf "%s" "$PROJECT/source $PROJECT/inc include/$PROJECT "`
# project header files can be in $PROJECT/inc and/pr include/$PROJECT
if [ -d "$PROJECT/inc" ]; then
PROJECT_INCLUDE="$PROJECT/inc"
fi
if [ -d "include/$PROJECT" ]; then
PROJECT_INCLUDE="$PROJECT_INCLUDE $PROJECT_INCLUDE"
fi
DOXYGEN_INPUT=`printf "%s" "$PROJECT/source $PROJECT_INCLUDE"`
DOXYGEN_OUTPUT="$BASE_OUTPUT/$PROJECT" DOXYGEN_OUTPUT="$BASE_OUTPUT/$PROJECT"
DOXYGEN_OUR_TAGFILE="$DOXYGEN_OUTPUT/$PROJECT.tags" DOXYGEN_OUR_TAGFILE="$DOXYGEN_OUTPUT/$PROJECT.tags"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment