Repository: celix Updated Branches: refs/heads/release/celix-2.0.0 63c776221 -> 720b64b86
CELIX-335: Change make install-all -> make install for travis config Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/da78d305 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/da78d305 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/da78d305 Branch: refs/heads/release/celix-2.0.0 Commit: da78d305a734708da4890b5ecfb176d57babdaf0 Parents: a43d78b Author: Pepijn Noltes <[email protected]> Authored: Tue Jan 26 09:09:59 2016 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Tue Jan 26 09:09:59 2016 +0100 ---------------------------------------------------------------------- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/da78d305/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 5ff6b65..905c714 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,7 @@ script: - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export BUILD_OPTS="${BUILD_OPTS} -DENABLE_CODE_COVERAGE=ON"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then cmake ${BUILD_OPTIONS} ${BUILD_OPTIONS_LINUX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake ${BUILD_OPTIONS} ${BUILD_OPTIONS_OSX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON -DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi - - if [ -z "$ANDROID" ]; then make all && make deploy && make install-all; else cd .. && docker build -t celixandroid - < Dockerfile.Android ; fi + - if [ -z "$ANDROID" ]; then make all && make deploy && make install; else cd .. && docker build -t celixandroid - < Dockerfile.Android ; fi - if [ -z "$ANDROID" ]; then export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework:`pwd`/dfi && make test ARGS="-V"; else docker run celixandroid; fi after_success:
