celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [24/50] celix git commit: CELIX-335: fixed travis setup/Dockerfile
Date Mon, 11 Apr 2016 12:00:33 GMT
CELIX-335: fixed travis setup/Dockerfile


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/492c2147
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/492c2147
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/492c2147

Branch: refs/heads/master
Commit: 492c21476e45fe934ec9b09774c1e0711f50973d
Parents: 5c5f35a
Author: Bjoern Petri <bpetri@apache.org>
Authored: Tue Feb 9 13:17:26 2016 +0100
Committer: Bjoern Petri <bpetri@apache.org>
Committed: Tue Feb 9 13:17:26 2016 +0100

----------------------------------------------------------------------
 .travis.yml        | 6 +++---
 Dockerfile.Android | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/492c2147/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c0d2075..3e8b170 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,9 +31,9 @@ matrix:
        - os: linux
          compiler: gcc
          env: SANITIZE=1
-#       - os: linux
-#         compiler: clang
-#         env: ANDROID=1
+       - os: linux
+         compiler: clang
+         env: ANDROID=1
 
 
 before_install:

http://git-wip-us.apache.org/repos/asf/celix/blob/492c2147/Dockerfile.Android
----------------------------------------------------------------------
diff --git a/Dockerfile.Android b/Dockerfile.Android
index 6960ce7..49cf790 100644
--- a/Dockerfile.Android
+++ b/Dockerfile.Android
@@ -36,6 +36,8 @@ ENV CHOST arm-linux-androideabi
 
 # install needed tools
 
+RUN apt-get install -y software-properties-common && add-apt-repository ppa:george-edison55/cmake-3.x
+
 RUN apt-get update && apt-get install -y \
     automake \
     build-essential \
@@ -112,8 +114,9 @@ RUN curl -L -O ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz &&
\
 	
 
 # finally add celix src
+
 RUN git clone -b develop --single-branch https://github.com/apache/celix.git celix
 
-CMD mkdir -p celix/build-android && cd celix/build-android && cmake -DANDROID=TRUE
-DENABLE_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_REMOTE_SHELL=ON
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_EXAMPLES=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=OFF -DBUILD_RSA_TOPOLOGY_MANAGER=ON
-DFFI_LIBRARY=/build/output/libffi/lib/libffi.a -DFFI_INCLUDE_DIR=/build/output/libffi/lib/libffi-3.2.1/include
-DJANSSON_LIBRARY=/build/output/jansson/lib/libjansson.a -DJANSSON_INCLUDE_DIR=/build/output/jansson/include
-DCURL_LIBRARY=/build/output/curl/lib/libcurl.a -DCURL_INCLUDE_DIR=/build/output/curl/include
-DLIBXML2_LIBRARIES=/build/output/libxml2/lib/libxml2.a -DLIBXML2_INCLUDE_DIR=/build/output/libxml2/include/libxml2
-DZLIB_LIBRARY=/build/output/zlib/lib/libz.a -DZLIB_INCLUDE_DIR=/build/output/zlib/include
-DUUID_LIBRARY=/build/output/uuid/lib/libuuid.a -DUUID_INCLUDE_DIR=/build/output/uuid/incl
 ude -DCMAKE_INSTALL_PREFIX:PATH=/build/output/celix .. && make && make install-all
+CMD mkdir -p celix/build-android && cd celix/build-android && cmake -DANDROID=TRUE
-DENABLE_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_REMOTE_SHELL=ON
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_EXAMPLES=ON
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=OFF -DBUILD_RSA_TOPOLOGY_MANAGER=ON
-DFFI_LIBRARY=/build/output/libffi/lib/libffi.a -DFFI_INCLUDE_DIR=/build/output/libffi/lib/libffi-3.2.1/include
-DJANSSON_LIBRARY=/build/output/jansson/lib/libjansson.a -DJANSSON_INCLUDE_DIR=/build/output/jansson/include
-DCURL_LIBRARY=/build/output/curl/lib/libcurl.a -DCURL_INCLUDE_DIR=/build/output/curl/include
-DLIBXML2_LIBRARIES=/build/output/libxml2/lib/libxml2.a -DLIBXML2_INCLUDE_DIR=/build/output/libxml2/include/libxml2
-DZLIB_LIBRARY=/build/output/zlib/lib/libz.a -DZLIB_INCLUDE_DIR=/build/output/zlib/include
-DUUID_LIBRARY=/build/output/uuid/lib/libuuid.a -DUUID_INCLUDE_DIR=/build/output/uuid/incl
 ude -DCMAKE_INSTALL_PREFIX:PATH=/build/output/celix .. && make && make install
 
 # done


Mime
View raw message