gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1573 from esrrhs/master

Browse Source 
fix travis build
This commit is contained in:
Milo Yip 2019-09-25 14:27:37 +08:00 committed by GitHub
commit 6006d6b678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -20,7 +20,7 @@ env:
before_install: before_install:
- sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -qq - 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: matrix:
include: include:

19
travis-doxygen.sh
View File

@ -4,9 +4,8 @@
set -e set -e
DOXYGEN_VER=doxygen-1.8.15 DOXYGEN_VER=1_8_16
DOXYGEN_TAR=${DOXYGEN_VER}.linux.bin.tar.gz DOXYGEN_URL="https://codeload.github.com/doxygen/doxygen/tar.gz/Release_${DOXYGEN_VER}"
DOXYGEN_URL="http://doxygen.nl/files/${DOXYGEN_TAR}"
: ${GITHUB_REPO:="Tencent/rapidjson"} : ${GITHUB_REPO:="Tencent/rapidjson"}
GITHUB_HOST="github.com" GITHUB_HOST="github.com"
@ -47,9 +46,17 @@ abort() {
# install doxygen binary distribution # install doxygen binary distribution
doxygen_install() doxygen_install()
{ {
wget -O - "${DOXYGEN_URL}" | \ cd ${TMPDIR-/tmp}
tar xz -C ${TMPDIR-/tmp} ${DOXYGEN_VER}/bin/doxygen curl ${DOXYGEN_URL} -o doxygen.tar.gz
export PATH="${TMPDIR-/tmp}/${DOXYGEN_VER}/bin:$PATH" 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() doxygen_run()