[Libreoffice-commits] core.git: solenv/bin

[Chris Sherlock]

 solenv/bin/mkdocs.sh |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 247cd33817457789645827a52d79a1876b9760a3
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sat Jan 25 00:24:27 2014 +1100

    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 at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index ee53fe4..93f502f 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"