From fc7f622ee5bf58e4a8cec484e96369d455f1a72a Mon Sep 17 00:00:00 2001 From: thephez Date: Thu, 1 Feb 2018 15:41:57 -0500 Subject: [PATCH] Doxygen build updates - Add doxygen build/install script - Update travis config and script to work with changes --- .travis.yml | 11 +++++---- scripts/build-install-doxygen.sh | 29 +++++++++++++++++++++++ scripts/generateDocumentationAndDeploy.sh | 2 +- 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 scripts/build-install-doxygen.sh diff --git a/.travis.yml b/.travis.yml index e848d8c3..d26c50e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: # http://docs.travis-ci.com/user/environment-variables/#Global-Variables global: - BITCOINORG_BUILD_TYPE=deployment - - DOXYFILE: $TRAVIS_BUILD_DIR/doxygen/Doxyfile-dashdocs + - DOXYFILE: Doxyfile-dashdocs before_install: - gem update --system @@ -17,10 +17,9 @@ before_install: addons: apt: packages: - - doxygen - - doxygen-doc - - doxygen-latex - - doxygen-gui + - flex + - bison + - build-essential - graphviz script: make travis @@ -41,5 +40,7 @@ deploy: # Generate and deploy documentation after_success: - cd $TRAVIS_BUILD_DIR + - chmod +x scripts/build-install-doxygen.sh + - ./scripts/build-install-doxygen.sh - chmod +x scripts/generateDocumentationAndDeploy.sh - ./scripts/generateDocumentationAndDeploy.sh diff --git a/scripts/build-install-doxygen.sh b/scripts/build-install-doxygen.sh new file mode 100644 index 00000000..5210a146 --- /dev/null +++ b/scripts/build-install-doxygen.sh @@ -0,0 +1,29 @@ +#!/bin/sh +set -ex + +# 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 + +cd doxygen-src + +# Use v1.8.14 (2f4139de014bf03898320a45fe52c92872c1e0f4) +git checkout 2f4139de014bf03898320a45fe52c92872c1e0f4 . + +echo "Create build folder..." +mkdir build +cd build + +echo "Make..." +cmake -G "Unix Makefiles" .. +make + +echo "Done building doxygen..." +./bin/doxygen -v + +echo "doxygen path: " $(pwd) + +echo "Copy Doxygen binaries to $TRAVIS_BUILD_DIR" +cp ./bin/* $TRAVIS_BUILD_DIR + +cd $TRAVIS_BUILD_DIR diff --git a/scripts/generateDocumentationAndDeploy.sh b/scripts/generateDocumentationAndDeploy.sh index 687674de..ad45fef7 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. -doxygen $DOXYFILE 2>&1 | tee doxygen.log +$TRAVIS_BUILD_DIR/doxygen-src/build/bin/doxygen doc/$DOXYFILE 2>&1 | tee doxygen.log echo 'Done generating Doxygen code documentation...' #cat doxygen.log