diff options
| author | Kirk Shoop <kirk.shoop@microsoft.com> | 2015-06-04 10:29:17 -0700 |
|---|---|---|
| committer | Kirk Shoop <kirk.shoop@microsoft.com> | 2015-06-04 11:42:41 -0700 |
| commit | 3eb9f9c30f41574d01890667e906f1d06a79c640 (patch) | |
| tree | 844a80aaf4b1ae08b030ccb02906de63fe50d6e8 | |
| parent | b50f346d83ee368337b7f9f4f1dc663cbf573df4 (diff) | |
| download | RxCpp-3eb9f9c30f41574d01890667e906f1d06a79c640.tar.gz | |
fix broken doxygen
| -rw-r--r-- | .travis.yml | 22 | ||||
| -rw-r--r-- | projects/CMake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | projects/scripts/travis-doxygen.sh | 24 |
3 files changed, 24 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml index 8e4b442..9c96a9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ matrix: # - ubuntu-toolchain-r-test # - llvm-toolchain-precise - - env: BUILD_TYPE=Release CPP=11 ASAN=On LIBCXX=On + - env: BUILD_TYPE=Release CPP=11 ASAN=On LIBCXX=On RUN_TEST=On os: osx compiler: clang @@ -92,7 +92,7 @@ matrix: # sources: # - ubuntu-toolchain-r-test - - env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off + - env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off RUN_TEST=On os: linux compiler: gcc addons: &gcc49 @@ -100,6 +100,18 @@ matrix: packages: - g++-4.9 - cmake + sources: + - ubuntu-toolchain-r-test + - kubuntu-backports + + - env: GCC_VERSION=4.9 BUILD_TYPE=Release CPP=11 ASAN=Off LIBCXX=Off PROJECT=doc PUBLISH_DOCS=On + os: linux + compiler: gcc + addons: &gcc49docs + apt: + packages: + - g++-4.9 + - cmake - doxygen - graphviz sources: @@ -145,10 +157,10 @@ install: - if [ "$LIBCXX" == "On" ]; then CXX_LINKER_FLAGS="${CXX_FLAGS} -L/usr/lib/ -lc++"; fi - cmake . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_EXE_LINKER_FLAGS="${CXX_LINKER_FLAGS}" script: -- make VERBOSE=1 -- if [ -n "$GCC_VERSION" ]; then build/test/rxcppv2_test; fi +- make VERBOSE=1 $PROJECT +- if [ "$RUN_TEST" == "On" ]; then build/test/rxcppv2_test; fi after_success: -- sh projects/scripts/travis-doxygen.sh +- if [ "$PUBLISH_DOCS" == "On" ]; then sh projects/scripts/travis-doxygen.sh; fi branches: only: - master diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 254cd49..363a3f9 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -20,4 +20,3 @@ add_subdirectory(${EXAMPLES_DIR}/stop ${CMAKE_CURRENT_BINARY_DIR}/examples/stop) add_subdirectory(${EXAMPLES_DIR}/println ${CMAKE_CURRENT_BINARY_DIR}/examples/println) add_subdirectory(${EXAMPLES_DIR}/pythagorian ${CMAKE_CURRENT_BINARY_DIR}/examples/pythagorian) add_subdirectory(${EXAMPLES_DIR}/tests ${CMAKE_CURRENT_BINARY_DIR}/examples/tests) -add_subdirectory(${EXAMPLES_DIR}/doxygen ${CMAKE_CURRENT_BINARY_DIR}/examples/doxygen) diff --git a/projects/scripts/travis-doxygen.sh b/projects/scripts/travis-doxygen.sh index cb956b1..7ddb713 100644 --- a/projects/scripts/travis-doxygen.sh +++ b/projects/scripts/travis-doxygen.sh @@ -2,20 +2,10 @@ set -e -#if OS is linux or is not set -if [ "$TRAVIS_OS_NAME" = linux -o -z "$TRAVIS_OS_NAME" ]; then - if [ "$CC" = gcc ]; then - doxygen --version - dot -V - - cd projects/build - make doc -j1 - cd ../doxygen/html - git init - git config user.name "Kirk Shoop" - git config user.email "kirk.shoop@microsoft.com" - git add * - git commit -m "doxygen generated site" - git push --force "https://${GH_TOKEN}@github.com/Reactive-Extensions/RxCpp.git" master:gh-pages - fi -fi +cd projects/doxygen/html +git init +git config user.name "Kirk Shoop" +git config user.email "kirk.shoop@microsoft.com" +git add * +git commit -m "doxygen generated site" +git push --force "https://${GH_TOKEN}@github.com/Reactive-Extensions/RxCpp.git" master:gh-pages |