From a43ae6ed279440a65331d54ec300f533e4bca24e Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Tue, 15 Oct 2019 21:54:47 +0200 Subject: doxygen build script: don't output to /tmp The doxygen log-files was previously put in /tmp. This is usually fine on UNIX-type systems but when building the docs on Windows with Cygwin/MSYS2 tools the script can fail since that path is guaranteed to exist. This commit makes sure that the doxygen script outputs its files in a path relative to the current working directory. --- scripts/doxygen.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts/doxygen.sh') diff --git a/scripts/doxygen.sh b/scripts/doxygen.sh index e9afa365..48646237 100755 --- a/scripts/doxygen.sh +++ b/scripts/doxygen.sh @@ -21,10 +21,10 @@ pushd "${TOPDIR}" > /dev/null || exit # HTML generation # Check that doxygen runs warning free rm -rf docs/build/html/ -mkdir -p docs/build/ -doxygen > /tmp/docs_log.txt 2>&1 -if grep -i warning /tmp/docs_log.txt; then - echo "Doxygen warnings found" && cat /tmp/docs_log.txt && /bin/false; +mkdir -p docs/build/html/ +doxygen > docs/build/html/docs_log.txt 2>&1 +if grep -i warning docs/build/html/docs_log.txt; then + echo "Doxygen warnings found" && cat docs/build/html/docs_log.txt && /bin/false; else echo "No Doxygen warnings found"; fi @@ -34,9 +34,9 @@ fi mkdir -p docs/build/tmp_breathe python scripts/generate_breathe_friendly_general_doc.py rm -rf docs/build/xml/ -(cat Doxyfile; printf "GENERATE_HTML=NO\nGENERATE_XML=YES\nINPUT= src/iso19111 include/proj src/proj.h docs/build/tmp_breathe/general_doc.dox.reworked.h") | doxygen - > /tmp/docs_log.txt 2>&1 -if grep -i warning /tmp/docs_log.txt; then - echo "Doxygen warnings found" && cat /tmp/docs_log.txt && /bin/false; +(cat Doxyfile; printf "GENERATE_HTML=NO\nGENERATE_XML=YES\nINPUT= src/iso19111 include/proj src/proj.h docs/build/tmp_breathe/general_doc.dox.reworked.h") | doxygen - > docs/build/tmp_breathe/docs_log.txt 2>&1 +if grep -i warning docs/build/tmp_breathe/docs_log.txt; then + echo "Doxygen warnings found" && cat docs/build/tmp_breathe/docs_log.txt && /bin/false; else echo "No Doxygen warnings found"; fi -- cgit v1.2.3