Skip to content

Commit

Permalink
Merge pull request Tencent#1573 from esrrhs/master
Browse files Browse the repository at this point in the history
fix travis build
  • Loading branch information
miloyip authored Sep 25, 2019
2 parents fcec773 + 02d4ae8 commit 6006d6b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
before_install:
- sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -qq
- sudo apt-get install -y cmake valgrind g++-multilib libc6-dbg:i386
- sudo apt-get install -y cmake valgrind g++-multilib libc6-dbg:i386 --allow-unauthenticated

matrix:
include:
Expand Down
19 changes: 13 additions & 6 deletions travis-doxygen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@

set -e

DOXYGEN_VER=doxygen-1.8.15
DOXYGEN_TAR=${DOXYGEN_VER}.linux.bin.tar.gz
DOXYGEN_URL="http://doxygen.nl/files/${DOXYGEN_TAR}"
DOXYGEN_VER=1_8_16
DOXYGEN_URL="https://codeload.github.com/doxygen/doxygen/tar.gz/Release_${DOXYGEN_VER}"

: ${GITHUB_REPO:="Tencent/rapidjson"}
GITHUB_HOST="github.com"
Expand Down Expand Up @@ -47,9 +46,17 @@ abort() {
# install doxygen binary distribution
doxygen_install()
{
wget -O - "${DOXYGEN_URL}" | \
tar xz -C ${TMPDIR-/tmp} ${DOXYGEN_VER}/bin/doxygen
export PATH="${TMPDIR-/tmp}/${DOXYGEN_VER}/bin:$PATH"
cd ${TMPDIR-/tmp}
curl ${DOXYGEN_URL} -o doxygen.tar.gz
tar zxvf doxygen.tar.gz
mkdir doxygen_build
cd doxygen_build
cmake ../doxygen-Release_${DOXYGEN_VER}/
make

export PATH="${TMPDIR-/tmp}/doxygen_build/bin:$PATH"

cd ../../
}

doxygen_run()
Expand Down

0 comments on commit 6006d6b

Please sign in to comment.