celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-370: Disables C++ dep man for android
Date Thu, 21 Jul 2016 13:20:54 GMT
Repository: celix
Updated Branches:
  refs/heads/develop cbb2191e0 -> f453a4676


CELIX-370: Disables C++ dep man for android


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

Branch: refs/heads/develop
Commit: f453a46761295fe69ebc58d3769f6f3a5a0a7eef
Parents: cbb2191
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Thu Jul 21 15:20:32 2016 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Thu Jul 21 15:20:32 2016 +0200

----------------------------------------------------------------------
 Dockerfile.Android | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/f453a467/Dockerfile.Android
----------------------------------------------------------------------
diff --git a/Dockerfile.Android b/Dockerfile.Android
index 304dc42..879ee9e 100644
--- a/Dockerfile.Android
+++ b/Dockerfile.Android
@@ -131,6 +131,6 @@ RUN curl -L -O ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz &&
\
 
 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
+CMD mkdir -p celix/build-android && cd celix/build-android && cmake -DANDROID=TRUE
-DENABLE_TESTING=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DEPENDENCY_MANAGER_CXX=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/include -DCMAKE_INSTALL_PREFIX:PATH=/build/output/celix ..
&& make && make install
 
 # done


Mime
View raw message