From fc8bd7541d65c94932c714ad5d45a0d984c5798f Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Mon, 7 Jul 2014 22:26:44 +0800 Subject: [PATCH 01/26] Try running doxygen --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 74a2a2fe..71ff2af3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_install: - sudo add-apt-repository -y ppa:codegear/release - sudo apt-get update -qq - sudo apt-get install -y premake4 valgrind + - sudo apt-get install doxygen install: true @@ -27,3 +28,11 @@ script: - ./unittest_${config_suffix} - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix} - ./perftest_${config_suffix} + +after_script: + - doxygen build/Doxyfile + +matrix: + include: + - compiler=clang + config=release64 From 71901bc84e8a293630fefcf95ac42d8692d595d6 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Mon, 7 Jul 2014 23:08:37 +0800 Subject: [PATCH 02/26] Try again --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71ff2af3..9b940e87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,7 @@ env: before_install: - sudo add-apt-repository -y ppa:codegear/release - sudo apt-get update -qq - - sudo apt-get install -y premake4 valgrind - - sudo apt-get install doxygen + - sudo apt-get install -y premake4 valgrind doxygen install: true @@ -31,8 +30,3 @@ script: after_script: - doxygen build/Doxyfile - -matrix: - include: - - compiler=clang - config=release64 From 7384fe979c4f65196ae939c9f5bce1933723dc08 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Mon, 7 Jul 2014 23:17:09 +0800 Subject: [PATCH 03/26] Change directory --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b940e87..a103074a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,9 @@ script: - make -C build/gmake -f example.make - cd bin - ./unittest_${config_suffix} - - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix} - - ./perftest_${config_suffix} +# - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix} +# - ./perftest_${config_suffix} after_script: + - cd "${TRAVIS_BUILD_DIR}" - doxygen build/Doxyfile From bb7f2c8e722ec7e235e1eec71640504ffb0cf2d8 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Mon, 7 Jul 2014 23:26:40 +0800 Subject: [PATCH 04/26] Install latest doxygen --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a103074a..7063b41a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ env: before_install: - sudo add-apt-repository -y ppa:codegear/release - sudo apt-get update -qq - - sudo apt-get install -y premake4 valgrind doxygen + - sudo apt-get install -y premake4 valgrind install: true @@ -29,5 +29,15 @@ script: # - ./perftest_${config_suffix} after_script: + - cd "${TRAVIS_BUILD_DIR}" + - git clone https://github.com/doxygen/doxygen.git + - cd doxygen + - ./configure + - make + - make distclean + - git pull + - ./configure + - make + - make install - cd "${TRAVIS_BUILD_DIR}" - doxygen build/Doxyfile From 1f655cb48e712ffb9b54ed48d94a3d29db5722b2 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Mon, 7 Jul 2014 23:34:41 +0800 Subject: [PATCH 05/26] Try default doxygen --- .travis.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7063b41a..602db4ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,15 +29,5 @@ script: # - ./perftest_${config_suffix} after_script: - - cd "${TRAVIS_BUILD_DIR}" - - git clone https://github.com/doxygen/doxygen.git - - cd doxygen - - ./configure - - make - - make distclean - - git pull - - ./configure - - make - - make install - cd "${TRAVIS_BUILD_DIR}" - doxygen build/Doxyfile From 4a49c5eff6f0642a5ab58c5446cd7b525c153194 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 00:20:10 +0800 Subject: [PATCH 06/26] build doxygen --- .travis.yml | 4 ++-- build/travis_doxygen.sh | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 build/travis_doxygen.sh diff --git a/.travis.yml b/.travis.yml index 602db4ac..01868402 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,6 @@ script: # - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix} # - ./perftest_${config_suffix} -after_script: +after_success : - cd "${TRAVIS_BUILD_DIR}" - - doxygen build/Doxyfile + - build/travis_doxygen.sh diff --git a/build/travis_doxygen.sh b/build/travis_doxygen.sh new file mode 100644 index 00000000..76c55b55 --- /dev/null +++ b/build/travis_doxygen.sh @@ -0,0 +1,16 @@ +#!/bin/sh +if ["${config}"="release64" && "$CC"="clang"] then exit 0 fi + +cd /tmp +git clone https://github.com/doxygen/doxygen.git +cd doxygen +./configure +make +make distclean +git pull +./configure +make +make install + +cd "${TRAVIS_BUILD_DIR} +doxygen build/Doxyfile From 0e092bdb1300c4ea72ea479be5d090d008626f6b Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 00:29:08 +0800 Subject: [PATCH 07/26] Try build doxygen --- .travis.yml | 2 +- build/travis_doxygen.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01868402..d296adc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,4 @@ script: after_success : - cd "${TRAVIS_BUILD_DIR}" - - build/travis_doxygen.sh + - ./build/travis_doxygen.sh diff --git a/build/travis_doxygen.sh b/build/travis_doxygen.sh index 76c55b55..7b7a7deb 100644 --- a/build/travis_doxygen.sh +++ b/build/travis_doxygen.sh @@ -10,7 +10,7 @@ make distclean git pull ./configure make -make install +sudo make install cd "${TRAVIS_BUILD_DIR} doxygen build/Doxyfile From a3b05bbcff4244a5c90123e012e1acfc5ec5ea60 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 00:34:17 +0800 Subject: [PATCH 08/26] Adding sudo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d296adc6..6af5b9f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,4 @@ script: after_success : - cd "${TRAVIS_BUILD_DIR}" - - ./build/travis_doxygen.sh + - sudo build/travis_doxygen.sh From 3e88c558e4a50d244b0c5ae9cbfede3e97f03b6b Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 00:43:01 +0800 Subject: [PATCH 09/26] Adding ./ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6af5b9f7..1d0d8579 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,4 @@ script: after_success : - cd "${TRAVIS_BUILD_DIR}" - - sudo build/travis_doxygen.sh + - sudo ./build/travis_doxygen.sh From 461b84cf38733894c2913367ab8d2961b357d834 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 00:51:46 +0800 Subject: [PATCH 10/26] Add chmod +x --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d0d8579..a4a517c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,5 @@ script: after_success : - cd "${TRAVIS_BUILD_DIR}" - - sudo ./build/travis_doxygen.sh + - sudo chmod +x build/travis_doxygen.sh + - sudo build/travis_doxygen.sh From e5cd989d7f2455ad3b3140d4e1b2f8bae17e84a8 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 01:00:48 +0800 Subject: [PATCH 11/26] Fixes travis_doxygen.sh --- build/travis_doxygen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/travis_doxygen.sh b/build/travis_doxygen.sh index 7b7a7deb..65eed816 100644 --- a/build/travis_doxygen.sh +++ b/build/travis_doxygen.sh @@ -12,5 +12,5 @@ git pull make sudo make install -cd "${TRAVIS_BUILD_DIR} +cd "${TRAVIS_BUILD_DIR}" doxygen build/Doxyfile From 4720d4a2dd5ce1759c9e953aa7b731561a8b8945 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 01:18:38 +0800 Subject: [PATCH 12/26] Change line ending --- build/travis_doxygen.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/build/travis_doxygen.sh b/build/travis_doxygen.sh index 65eed816..01f8578a 100644 --- a/build/travis_doxygen.sh +++ b/build/travis_doxygen.sh @@ -1,16 +1,17 @@ #!/bin/sh -if ["${config}"="release64" && "$CC"="clang"] then exit 0 fi -cd /tmp -git clone https://github.com/doxygen/doxygen.git -cd doxygen -./configure -make -make distclean -git pull -./configure -make -sudo make install +if [ "${config}" == "release64" ] && [ "$CC" == "clang" ]; then + cd /tmp + git clone https://github.com/doxygen/doxygen.git + cd doxygen + ./configure + make + make distclean + git pull + ./configure + make + sudo make install -cd "${TRAVIS_BUILD_DIR}" -doxygen build/Doxyfile + cd "${TRAVIS_BUILD_DIR}" + doxygen build/Doxyfile +fi From bfba0d5ac90fcbfb3a82e11d7d8e72c954a24956 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 01:34:27 +0800 Subject: [PATCH 13/26] Fixes travis_doxygen.sh --- build/travis_doxygen.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/travis_doxygen.sh b/build/travis_doxygen.sh index 01f8578a..90aea3f6 100644 --- a/build/travis_doxygen.sh +++ b/build/travis_doxygen.sh @@ -1,6 +1,7 @@ #!/bin/sh -if [ "${config}" == "release64" ] && [ "$CC" == "clang" ]; then +if [ "${config}" = "release64" ] && [ "$CC" = "clang" ] +then cd /tmp git clone https://github.com/doxygen/doxygen.git cd doxygen From 91b5607cddf807b3457073cb29e9444936df229b Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 01:44:14 +0800 Subject: [PATCH 14/26] Try again --- build/travis_doxygen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/travis_doxygen.sh b/build/travis_doxygen.sh index 90aea3f6..648d4404 100644 --- a/build/travis_doxygen.sh +++ b/build/travis_doxygen.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ "${config}" = "release64" ] && [ "$CC" = "clang" ] +if [ "${config}" = "release64" ] && [ "${CC}" = "clang" ] then cd /tmp git clone https://github.com/doxygen/doxygen.git From 925998fd1ee873a054315b993d7eee3cea2bab5c Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 01:56:16 +0800 Subject: [PATCH 15/26] Again --- .travis.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a4a517c2..6210085c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,14 +21,24 @@ before_script: - cd "${TRAVIS_BUILD_DIR}" script: - - make -C build/gmake -f test.make - - make -C build/gmake -f example.make - - cd bin - - ./unittest_${config_suffix} +# - make -C build/gmake -f test.make +# - make -C build/gmake -f example.make +# - cd bin +# - ./unittest_${config_suffix} # - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix} # - ./perftest_${config_suffix} after_success : - cd "${TRAVIS_BUILD_DIR}" - - sudo chmod +x build/travis_doxygen.sh - - sudo build/travis_doxygen.sh + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then cd /tmp; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then git clone https://github.com/doxygen/doxygen.git; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then cd doxygen; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then ./configure; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then make; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then make distclean; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then git pull; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then ./configure; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then make; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then sudo make install; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then cd "${TRAVIS_BUILD_DIR}"; fi + - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then doxygen build/Doxyfile; fi From af226cf2990c73a165f73dbc9e51c2ecf5dc2f49 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 02:06:22 +0800 Subject: [PATCH 16/26] Try -a --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6210085c..fc14ae98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,15 +30,15 @@ script: after_success : - cd "${TRAVIS_BUILD_DIR}" - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then cd /tmp; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then git clone https://github.com/doxygen/doxygen.git; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then cd doxygen; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then ./configure; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then make; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then make distclean; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then git pull; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then ./configure; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then make; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then sudo make install; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then cd "${TRAVIS_BUILD_DIR}"; fi - - if [ "$config" = "release64" ] && [ "$CC" = "clang" ]; then doxygen build/Doxyfile; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd /tmp; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git clone https://github.com/doxygen/doxygen.git; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd doxygen; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then ./configure; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make distclean; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git pull; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then ./configure; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then sudo make install; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd "${TRAVIS_BUILD_DIR}"; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then doxygen build/Doxyfile; fi From 8fa09bc2fd3ea599d918dc13c4b86f3d97fa59bb Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 02:12:12 +0800 Subject: [PATCH 17/26] Try again --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc14ae98..01e0c800 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,13 +23,12 @@ before_script: script: # - make -C build/gmake -f test.make # - make -C build/gmake -f example.make -# - cd bin + - cd bin # - ./unittest_${config_suffix} # - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix} # - ./perftest_${config_suffix} -after_success : - - cd "${TRAVIS_BUILD_DIR}" +after_success: - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd /tmp; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git clone https://github.com/doxygen/doxygen.git; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd doxygen; fi From 095857fc6eaa2f507cc8d66ad9da3856f184fc32 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 02:54:35 +0800 Subject: [PATCH 18/26] Try automatic upload --- .travis.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01e0c800..edb30866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,11 @@ compiler: - gcc env: - - config=debug64 config_suffix=debug_x64_gmake - - config=release64 config_suffix=release_x64_gmake + matrix: + - config=debug64 config_suffix=debug_x64_gmake + - config=release64 config_suffix=release_x64_gmake + global: + secure: HAEPpA7IxUd+X4X5VcUpSxWf3hDRDNgNpKQrRSX/X/nS0/h5PAwES7fmM6WJAsoEmczCp3OOArzyOON+KLbISvJLnHvnexd+rtyVjU2zOOVTEgzJRdAPHwocqVx5FOxtlKgbDISE6dl3H5aUCycf962jfquhKosi11rbxwcscmc= before_install: - sudo add-apt-repository -y ppa:codegear/release @@ -29,6 +32,7 @@ script: # - ./perftest_${config_suffix} after_success: +# Build latest doxygen from source - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd /tmp; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git clone https://github.com/doxygen/doxygen.git; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd doxygen; fi @@ -40,4 +44,18 @@ after_success: - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then sudo make install; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd "${TRAVIS_BUILD_DIR}"; fi + +# Run doxygen - if [ "$config" = "release64" -a "$CC" = "clang" ]; then doxygen build/Doxyfile; fi + +# Push to Github Pages + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git config --global user.name "${GIT_NAME}"; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git config --global user.email ${GIT_EMAIL}; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then mkdir build/doc; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd build/doc; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git clone https://github.com/miloyip/rapidjson; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git checkout gh-pages; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cp -r ../../doc/html/* .; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git add --all; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git commit -m "Automatic doxygen build"; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git push https://${GH_TOKEN}@github.com/miloyip/rapidjson gh-pages; fi From 0fbb05c42bc9564fe7274dd63265f323be159a21 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 03:18:57 +0800 Subject: [PATCH 19/26] Try auto upload again --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index edb30866..bb80cd7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,8 +54,9 @@ after_success: - if [ "$config" = "release64" -a "$CC" = "clang" ]; then mkdir build/doc; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd build/doc; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git clone https://github.com/miloyip/rapidjson; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd rapidjson; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git checkout gh-pages; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cp -r ../../doc/html/* .; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cp -r ../../../doc/html/* .; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git add --all; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git commit -m "Automatic doxygen build"; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git push https://${GH_TOKEN}@github.com/miloyip/rapidjson gh-pages; fi From 45e246365cfae81135585ceeb6152952c10bc52a Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 03:45:14 +0800 Subject: [PATCH 20/26] Reactivate normal building process --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb80cd7a..9773057c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,12 +24,12 @@ before_script: - cd "${TRAVIS_BUILD_DIR}" script: -# - make -C build/gmake -f test.make -# - make -C build/gmake -f example.make + - make -C build/gmake -f test.make + - make -C build/gmake -f example.make - cd bin -# - ./unittest_${config_suffix} -# - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix} -# - ./perftest_${config_suffix} + - ./unittest_${config_suffix} + - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix} + - if [ "$config" = "release64" ]; then ./perftest_${config_suffix}; fi after_success: # Build latest doxygen from source From b85f16154f2b36608c35a0cb409948b8a60be638 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 08:33:14 +0800 Subject: [PATCH 21/26] fixes whitespaces --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9773057c..e23ef628 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,8 @@ before_script: script: - make -C build/gmake -f test.make - - make -C build/gmake -f example.make - - cd bin + - make -C build/gmake -f example.make + - cd bin - ./unittest_${config_suffix} - valgrind --leak-check=full --error-exitcode=1 ./unittest_${config_suffix} - if [ "$config" = "release64" ]; then ./perftest_${config_suffix}; fi From 2e8f7e95a0d894b1071e098ad6b9e23a91da00c6 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 09:04:09 +0800 Subject: [PATCH 22/26] Try using doxygen binary --- .travis.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index e23ef628..971e15ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,17 +33,24 @@ script: after_success: # Build latest doxygen from source +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd /tmp; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git clone https://github.com/doxygen/doxygen.git; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd doxygen; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then ./configure; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make distclean; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git pull; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then ./configure; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then sudo make install; fi +# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd "${TRAVIS_BUILD_DIR}"; fi + +# Install doxygen binary distribution - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd /tmp; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git clone https://github.com/doxygen/doxygen.git; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd doxygen; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then ./configure; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make distclean; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then git pull; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then ./configure; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then sudo make install; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd "${TRAVIS_BUILD_DIR}"; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then curl http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.7.linux.bin.tar.gz; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then tar -xvf doxygen-1.8.7.linux.bin.tar.gz; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd doxygen-1.8.7; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then sudo install -m 755 doxygen-1.8.7/bin/doxygen /usr/bin; fi # Run doxygen - if [ "$config" = "release64" -a "$CC" = "clang" ]; then doxygen build/Doxyfile; fi From 4287a4b2b829317d3401c6c621ca004676b4b767 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 09:13:29 +0800 Subject: [PATCH 23/26] Use wget instead of curl --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 971e15ad..283110fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ after_success: # Install doxygen binary distribution - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd /tmp; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then curl http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.7.linux.bin.tar.gz; fi + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then wget http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.7.linux.bin.tar.gz; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then tar -xvf doxygen-1.8.7.linux.bin.tar.gz; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd doxygen-1.8.7; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then sudo install -m 755 doxygen-1.8.7/bin/doxygen /usr/bin; fi From 8021a626f5dfefddaff39b1b122c31e9b9c3ca6a Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 09:21:50 +0800 Subject: [PATCH 24/26] Fixes path --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 283110fe..34b238f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,6 @@ after_success: - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd /tmp; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then wget http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.7.linux.bin.tar.gz; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then tar -xvf doxygen-1.8.7.linux.bin.tar.gz; fi - - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd doxygen-1.8.7; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then sudo install -m 755 doxygen-1.8.7/bin/doxygen /usr/bin; fi # Run doxygen From 9fbb638a6523c7d82bb41f72bbb4320cd16d9014 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 09:30:59 +0800 Subject: [PATCH 25/26] Fixes another path issue --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 34b238f7..55cf8ae7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,6 @@ after_success: # - if [ "$config" = "release64" -a "$CC" = "clang" ]; then ./configure; fi # - if [ "$config" = "release64" -a "$CC" = "clang" ]; then make; fi # - if [ "$config" = "release64" -a "$CC" = "clang" ]; then sudo make install; fi -# - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd "${TRAVIS_BUILD_DIR}"; fi # Install doxygen binary distribution - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd /tmp; fi @@ -52,6 +51,7 @@ after_success: - if [ "$config" = "release64" -a "$CC" = "clang" ]; then sudo install -m 755 doxygen-1.8.7/bin/doxygen /usr/bin; fi # Run doxygen + - if [ "$config" = "release64" -a "$CC" = "clang" ]; then cd "${TRAVIS_BUILD_DIR}"; fi - if [ "$config" = "release64" -a "$CC" = "clang" ]; then doxygen build/Doxyfile; fi # Push to Github Pages From a0e2a1e03fbc70fc046636e9e48942bd0e705515 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Tue, 8 Jul 2014 09:40:18 +0800 Subject: [PATCH 26/26] Remove unused sh --- build/travis_doxygen.sh | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 build/travis_doxygen.sh diff --git a/build/travis_doxygen.sh b/build/travis_doxygen.sh deleted file mode 100644 index 648d4404..00000000 --- a/build/travis_doxygen.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -if [ "${config}" = "release64" ] && [ "${CC}" = "clang" ] -then - cd /tmp - git clone https://github.com/doxygen/doxygen.git - cd doxygen - ./configure - make - make distclean - git pull - ./configure - make - sudo make install - - cd "${TRAVIS_BUILD_DIR}" - doxygen build/Doxyfile -fi