Skip to content

Commit 6006d6b

Browse files
authored
Merge pull request Tencent#1573 from esrrhs/master
fix travis build
2 parents fcec773 + 02d4ae8 commit 6006d6b

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
before_install:
2121
- sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
2222
- sudo apt-get update -qq
23-
- sudo apt-get install -y cmake valgrind g++-multilib libc6-dbg:i386
23+
- sudo apt-get install -y cmake valgrind g++-multilib libc6-dbg:i386 --allow-unauthenticated
2424

2525
matrix:
2626
include:

travis-doxygen.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44

55
set -e
66

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

1110
: ${GITHUB_REPO:="Tencent/rapidjson"}
1211
GITHUB_HOST="github.com"
@@ -47,9 +46,17 @@ abort() {
4746
# install doxygen binary distribution
4847
doxygen_install()
4948
{
50-
wget -O - "${DOXYGEN_URL}" | \
51-
tar xz -C ${TMPDIR-/tmp} ${DOXYGEN_VER}/bin/doxygen
52-
export PATH="${TMPDIR-/tmp}/${DOXYGEN_VER}/bin:$PATH"
49+
cd ${TMPDIR-/tmp}
50+
curl ${DOXYGEN_URL} -o doxygen.tar.gz
51+
tar zxvf doxygen.tar.gz
52+
mkdir doxygen_build
53+
cd doxygen_build
54+
cmake ../doxygen-Release_${DOXYGEN_VER}/
55+
make
56+
57+
export PATH="${TMPDIR-/tmp}/doxygen_build/bin:$PATH"
58+
59+
cd ../../
5360
}
5461

5562
doxygen_run()

0 commit comments

Comments
 (0)