CELIX-279: Added missing end if (fi) to travis config
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/3e4e9d23 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/3e4e9d23 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/3e4e9d23 Branch: refs/heads/feature/CELIX-269_depman Commit: 3e4e9d23b763a23edb8052807bd1752b9ef3a95d Parents: 6a4da96 Author: Pepijn Noltes <pepijnnol...@gmail.com> Authored: Mon Oct 26 20:42:54 2015 +0100 Committer: Pepijn Noltes <pepijnnol...@gmail.com> Committed: Mon Oct 26 20:42:54 2015 +0100 ---------------------------------------------------------------------- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/3e4e9d23/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 52c81d8..d233897 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ script: # RSA_DISCOVERY_SHM is only working on linux, but both compilers (see CELIX-277) # RSA_SHM is only working on linux, but both compilers (see CELIX-277) - cd build - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export BUILD_OPTS="-DFFI_INCLUDE_DIR=/usr/local/lib/libffi-3.0.13/include -DFFI_LIBRARY=/usr/local/lib/libffi.dylib" + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export BUILD_OPTS="-DFFI_INCLUDE_DIR=/usr/local/lib/libffi-3.0.13/include -DFFI_LIBRARY=/usr/local/lib/libffi.dylib"; fi - if [ "$CC" = "clang" ] || [ "$TRAVIS_OS_NAME" = "osx" ]; then export BUILD_OPTS="${BUILD_OPTS}"; else export BUILD_OPTS="${BUILD_OPTS} -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON -DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON -DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON -DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF -DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake -DBUILD_DEPLOYMENT_ADMIN=ON -DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=OFF -DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=OFF -DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_REMOTE_SHELL=ON -DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON -DBUILD_DEVICE_ACCESS_EXAMPLE=ON -DBUILD_FRAMEWORK_TESTS=OFF -DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON -DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi