You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2015/10/29 16:29:02 UTC
[11/50] celix git commit: CELIX-237: Removed src build libffi from
travis config
CELIX-237: Removed src build libffi from travis config
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/46144818
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/46144818
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/46144818
Branch: refs/heads/feature/CELIX-269_depman
Commit: 46144818a7349f4c7fb35e2fd88f5be837ef2f2d
Parents: f202325
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Wed Oct 14 21:48:16 2015 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Wed Oct 14 21:48:16 2015 +0200
----------------------------------------------------------------------
.travis.yml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/46144818/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 55d4008..8b7f0d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: c
before_install:
- sudo apt-get update -qq
- - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov pkg-config
+ - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov pkg-config libffi-dev
matrix:
include:
@@ -18,18 +18,13 @@ before_script:
- cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . && make
- sudo make install
- cd -
- - wget ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz -O /tmp/libffi.tar.gz
- - tar xzf /tmp/libffi.tar.gz
- - cd libffi*
- - ./configure --prefix=/usr/local && make && sudo make install
- - cd -
- mkdir build install
script:
- cd build
- - cmake -DFFI_LIBRARY=/usr/local/lib/libffi.so -DFFI_INCLUDE_DIR=/usr/local/include -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 -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DCMAKE_INSTALL_PREFIX=../install ..
+ - 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 -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DCMAKE_INSTALL_PREFIX=../install ..
- make all && make deploy && make install-all
- - export LD_PRELOAD=/usr/local/lib/libffi.so && export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && make test ARGS="-V" && make coverage
+ - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && make test ARGS="-V" && make coverage
after_success:
- cd ${TRAVIS_BUILD_DIR}/build