From a21ce80deb785bc8fd414c34acf2d5b1ff02097b Mon Sep 17 00:00:00 2001 From: thephez Date: Thu, 25 Jan 2018 14:24:02 -0500 Subject: [PATCH] build - Install doxygen manually (for correct version) --- .travis.yml | 9 ++------- scripts/generateDocumentationAndDeploy.sh | 3 +-- scripts/install-doxygen.sh | 5 +++++ 3 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 scripts/install-doxygen.sh diff --git a/.travis.yml b/.travis.yml index beb418d3..06493be4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,11 @@ env: global: - BITCOINORG_BUILD_TYPE=deployment - DOXYFILE: $TRAVIS_BUILD_DIR/doxygen/Doxyfile-dashdocs - #- GH_REPO_NAME: - #- GH_REPO_REF: github.com//.git - before_install: - gem update --system - gem install bundler + - ./install-doxygen.sh # Install dependencies addons: @@ -44,8 +42,5 @@ deploy: # Generate and deploy documentation after_success: - cd $TRAVIS_BUILD_DIR - - ls - - echo $DOXYFILE - - pwd - chmod +x scripts/generateDocumentationAndDeploy.sh - - ./scripts/generateDocumentationAndDeploy.sh + - ./scripts/generateDocumentationAndDeploy.sh diff --git a/scripts/generateDocumentationAndDeploy.sh b/scripts/generateDocumentationAndDeploy.sh index 66e08486..687674de 100644 --- a/scripts/generateDocumentationAndDeploy.sh +++ b/scripts/generateDocumentationAndDeploy.sh @@ -43,6 +43,7 @@ set -e git clone https://github.com/dashpay/dash.git cd dash +# Copy Doxygen config / build files cp $TRAVIS_BUILD_DIR/doxygen/* doc/ ################################################################################ @@ -54,8 +55,6 @@ doxygen $DOXYFILE 2>&1 | tee doxygen.log echo 'Done generating Doxygen code documentation...' #cat doxygen.log -ls doc/ - # Copy Doxygen files to dash-docs folder echo 'Copy Doxygen files to _site...' cp -R doc/doxygen $TRAVIS_BUILD_DIR/_site/en/ diff --git a/scripts/install-doxygen.sh b/scripts/install-doxygen.sh new file mode 100644 index 00000000..9f5537f3 --- /dev/null +++ b/scripts/install-doxygen.sh @@ -0,0 +1,5 @@ +#!/bin/sh +set -ex +wget http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.14.linux.bin.tar.gz +tar -xzvf doxygen-1.8.14.linux.bin.tar.gz +cd doxygen-1.8.14 && ./configure && make install