diff --git a/.travis.yml b/.travis.yml index b6fe0680..8346c6e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ sudo: false cache: bundler cache: directories: - - $TRAVIS_BUILD_DIR/doxygen-src/build/bin + - $TRAVIS_BUILD_DIR/doxygen-install env: # http://docs.travis-ci.com/user/environment-variables/#Global-Variables global: diff --git a/scripts/build-install-doxygen.sh b/scripts/build-install-doxygen.sh index fc5f1a78..1702e9ef 100644 --- a/scripts/build-install-doxygen.sh +++ b/scripts/build-install-doxygen.sh @@ -1,8 +1,6 @@ #!/bin/sh set -ex -echo $(ls doxygen-src/build/bin) - # Build instructions from: https://www.stack.nl/~dimitri/doxygen/download.html echo "Cloning doxygen repository..." git clone https://github.com/doxygen/doxygen.git doxygen-src @@ -23,4 +21,8 @@ make echo "Done building doxygen..." ./bin/doxygen -v +echo "Copy Doxygen binary to folder for caching..." +mkdir -p $TRAVIS_BUILD_DIR/doxygen-install +cp bin/doxygen $TRAVIS_BUILD_DIR/doxygen-install/ + cd $TRAVIS_BUILD_DIR diff --git a/scripts/generateDocumentationAndDeploy.sh b/scripts/generateDocumentationAndDeploy.sh index ad45fef7..7c224ee6 100644 --- a/scripts/generateDocumentationAndDeploy.sh +++ b/scripts/generateDocumentationAndDeploy.sh @@ -50,7 +50,7 @@ cp $TRAVIS_BUILD_DIR/doxygen/* doc/ ##### Generate the Doxygen code documentation and log the output. ##### echo 'Generating Doxygen code documentation...' # Redirect both stderr and stdout to the log file AND the console. -$TRAVIS_BUILD_DIR/doxygen-src/build/bin/doxygen doc/$DOXYFILE 2>&1 | tee doxygen.log +$TRAVIS_BUILD_DIR/doxygen-install/doxygen doc/$DOXYFILE 2>&1 | tee doxygen.log echo 'Done generating Doxygen code documentation...' #cat doxygen.log