[28/51] celix git commit: CELIX-77: Enable config_admin. Refactor travis.yml to that the enabled subproject are more clearly stated in seperated lines

2016-01-25 Thread pnoltes 
CELIX-77: Enable config_admin. Refactor travis.yml to that the enabled 
subproject are more clearly stated in seperated lines


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

Branch: refs/heads/feature/CELIX-335_deploy_refactoring
Commit: fb8bef5326f3a51a433e2873c30150c592e4aa0d
Parents: 3605d26
Author: Pepijn Noltes 
Authored: Thu Jan 14 11:17:28 2016 +0100
Committer: Pepijn Noltes 
Committed: Thu Jan 14 11:17:28 2016 +0100

--
 .travis.yml | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/fb8bef53/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 55eab3e..e2308b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,24 @@ before_script:
 - sudo make install
 - cd -
 - mkdir build install
+- export BUILD_OPTIONS=" \
+-DBUILD_CONFIG_ADMIN=ON \
+-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON \
+-DBUILD_DEPLOYMENT_ADMIN=ON \
+-DBUILD_DEPENDENCY_MANAGER=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 \
+"
 
 
 script:
@@ -49,8 +67,8 @@ script:
  # RSA_SHM is only working on linux, but both compilers (see CELIX-277)
 - cd build
 - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export 
BUILD_OPTS="${BUILD_OPTS} -DENABLE_CODE_COVERAGE=ON"; fi
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DBUILD_DEPLOYMENT_ADMIN=ON 
-DBUILD_DEPENDENCY_MANAGER=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=ON 
-DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DBUILD_DEPLOYMENT_ADMIN=ON 
-DBUILD_DEPENDENCY_MANAGER=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=ON 
-DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ${BUILD_OPTIONS} 
-DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON 
${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake ${BUILD_OPTIONS} 
-DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
 - make all && make deploy && make install-all
 - export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework:`pwd`/dfi
 && make test ARGS="-V"

celix git commit: CELIX-77: Enable config_admin. Refactor travis.yml to that the enabled subproject are more clearly stated in seperated lines

2016-01-14 Thread pnoltes 
Repository: celix
Updated Branches:
  refs/heads/develop 3605d26ac -> fb8bef532


CELIX-77: Enable config_admin. Refactor travis.yml to that the enabled 
subproject are more clearly stated in seperated lines


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

Branch: refs/heads/develop
Commit: fb8bef5326f3a51a433e2873c30150c592e4aa0d
Parents: 3605d26
Author: Pepijn Noltes 
Authored: Thu Jan 14 11:17:28 2016 +0100
Committer: Pepijn Noltes 
Committed: Thu Jan 14 11:17:28 2016 +0100

--
 .travis.yml | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/celix/blob/fb8bef53/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 55eab3e..e2308b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,24 @@ before_script:
 - sudo make install
 - cd -
 - mkdir build install
+- export BUILD_OPTIONS=" \
+-DBUILD_CONFIG_ADMIN=ON \
+-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON \
+-DBUILD_DEPLOYMENT_ADMIN=ON \
+-DBUILD_DEPENDENCY_MANAGER=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 \
+"
 
 
 script:
@@ -49,8 +67,8 @@ script:
  # RSA_SHM is only working on linux, but both compilers (see CELIX-277)
 - cd build
 - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export 
BUILD_OPTS="${BUILD_OPTS} -DENABLE_CODE_COVERAGE=ON"; fi
-- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DBUILD_DEPLOYMENT_ADMIN=ON 
-DBUILD_DEPENDENCY_MANAGER=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=ON 
-DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
-- if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake 
-DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DBUILD_DEPLOYMENT_ADMIN=ON 
-DBUILD_DEPENDENCY_MANAGER=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=ON 
-DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
+- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ${BUILD_OPTIONS} 
-DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON 
${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake ${BUILD_OPTIONS} 
-DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON 
-DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} 
-DCMAKE_INSTALL_PREFIX=../install ..; fi
 - make all && make deploy && make install-all
 - export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework:`pwd`/dfi
 && make test ARGS="-V"