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-335: Disable config_admin, issue for osx. Disable Android.
Date Fri, 05 Feb 2016 13:54:08 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 2e31fdd53 -> 3a4528187


CELIX-335: Disable config_admin, issue for osx. Disable Android.

Android currently does not build because CMake 2.8 is used. A upgrade in the DockerFile is
needed.


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

Branch: refs/heads/develop
Commit: 3a45281872bac1f0b5ef539e509ed17977b5a2de
Parents: 2e31fdd
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Fri Feb 5 14:52:26 2016 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Fri Feb 5 14:52:26 2016 +0100

----------------------------------------------------------------------
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/3a452818/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 7448d72..c0d2075 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:
@@ -53,7 +53,7 @@ before_script:
     - cd -
     - mkdir build install
     - export BUILD_OPTIONS=" \
-        -DBUILD_CONFIG_ADMIN=ON \
+        -DBUILD_CONFIG_ADMIN=OFF \
         -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON \
         -DBUILD_DEPLOYMENT_ADMIN=ON \
         -DBUILD_DEPENDENCY_MANAGER=ON \


Mime
View raw message