diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-01-25 00:24:27 +1100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-26 19:31:33 +0000 |
| commit | 247cd33817457789645827a52d79a1876b9760a3 (patch) | |
| tree | d5e81b8019f4c2359ed57be56515062deecd7a95 /solenv | |
| parent | b7ad3991628b0dee40bb1f823ca90b5c71b49939 (diff) | |
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/7631
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/mkdocs.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index ee53fe4f4b1d..93f502f0d863 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -157,7 +157,17 @@ DOXYGEN_REF_TAGFILES="" for PROJECT in $INPUT_PROJECTS; do # 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_OUR_TAGFILE="$DOXYGEN_OUTPUT/$PROJECT.tags" |