From d3c4b2b2b1cd7e5f984eb5061abf1d083d7a1bcd Mon Sep 17 00:00:00 2001 From: zhao xin Date: Wed, 25 Sep 2019 10:17:39 +0800 Subject: [PATCH 1/6] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index df821a7..e759ccb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,9 @@ env: - secure: "HrsaCb+N66EG1HR+LWH1u51SjaJyRwJEDzqJGYMB7LJ/bfqb9mWKF1fLvZGk46W5t7TVaXRDD5KHFx9DPWvKn4gRUVkwTHEy262ah5ORh8M6n/6VVVajeV/AYt2C0sswdkDBDO4Xq+xy5gdw3G8s1A4Inbm73pUh+6vx+7ltBbk=" before_install: - - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test --allow-unauthenticated - 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: From ed234bf7490a5866531d148bfa42f5bc9ea6bf4d Mon Sep 17 00:00:00 2001 From: zhao xin Date: Wed, 25 Sep 2019 10:26:39 +0800 Subject: [PATCH 2/6] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e759ccb..783c052 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: - secure: "HrsaCb+N66EG1HR+LWH1u51SjaJyRwJEDzqJGYMB7LJ/bfqb9mWKF1fLvZGk46W5t7TVaXRDD5KHFx9DPWvKn4gRUVkwTHEy262ah5ORh8M6n/6VVVajeV/AYt2C0sswdkDBDO4Xq+xy5gdw3G8s1A4Inbm73pUh+6vx+7ltBbk=" before_install: - - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test --allow-unauthenticated + - 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 --allow-unauthenticated From b2861565aa0e158f96b871076a063a5c992ca49c Mon Sep 17 00:00:00 2001 From: zhao xin Date: Wed, 25 Sep 2019 11:16:06 +0800 Subject: [PATCH 3/6] Update travis-doxygen.sh --- travis-doxygen.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/travis-doxygen.sh b/travis-doxygen.sh index 38e4eb6..8a7898b 100755 --- a/travis-doxygen.sh +++ b/travis-doxygen.sh @@ -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" @@ -50,6 +49,18 @@ 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() From c136acf02387c27a32270102bbd2a39401b2e85e Mon Sep 17 00:00:00 2001 From: zhao xin Date: Wed, 25 Sep 2019 11:16:26 +0800 Subject: [PATCH 4/6] Update travis-doxygen.sh --- travis-doxygen.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/travis-doxygen.sh b/travis-doxygen.sh index 8a7898b..85e92a1 100755 --- a/travis-doxygen.sh +++ b/travis-doxygen.sh @@ -46,11 +46,7 @@ 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} + cd ${TMPDIR-/tmp} curl ${DOXYGEN_URL} -o doxygen.tar.gz tar zxvf doxygen.tar.gz mkdir doxygen_build @@ -60,7 +56,7 @@ doxygen_install() export PATH="${TMPDIR-/tmp}/doxygen_build/bin:$PATH" - cd ../../ + cd ../../ } doxygen_run() From 4c1d9edb359c6dbf43ebfcdadc074e205b9d4311 Mon Sep 17 00:00:00 2001 From: zhao xin Date: Wed, 25 Sep 2019 11:16:55 +0800 Subject: [PATCH 5/6] Update travis-doxygen.sh --- travis-doxygen.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/travis-doxygen.sh b/travis-doxygen.sh index 85e92a1..89f5854 100755 --- a/travis-doxygen.sh +++ b/travis-doxygen.sh @@ -46,17 +46,17 @@ abort() { # install doxygen binary distribution doxygen_install() { - 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 + 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" + export PATH="${TMPDIR-/tmp}/doxygen_build/bin:$PATH" - cd ../../ + cd ../../ } doxygen_run() From 02d4ae838c084c4f3431b4939eee06754988fe41 Mon Sep 17 00:00:00 2001 From: zhao xin Date: Wed, 25 Sep 2019 11:17:28 +0800 Subject: [PATCH 6/6] Update travis-doxygen.sh --- travis-doxygen.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/travis-doxygen.sh b/travis-doxygen.sh index 89f5854..cf18dc3 100755 --- a/travis-doxygen.sh +++ b/travis-doxygen.sh @@ -46,17 +46,17 @@ abort() { # install doxygen binary distribution doxygen_install() { - 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 + 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" + export PATH="${TMPDIR-/tmp}/doxygen_build/bin:$PATH" - cd ../../ + cd ../../ } doxygen_run()