celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [46/50] [abbrv] celix git commit: CELIX-237: Merge branch 'develop' into ffi
Date Tue, 13 Oct 2015 10:22:14 GMT
CELIX-237: Merge branch 'develop' into ffi

Conflicts:
	.travis.yml
	launcher/private/src/launcher.c
	remote_services/discovery/private/src/endpoint_discovery_poller.c
	utils/CMakeLists.txt


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

Branch: refs/heads/develop
Commit: 119bb95046bf338613f7d7c6439af328ced2172f
Parents: a13465a cec955d
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Oct 7 14:43:09 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Oct 7 14:43:09 2015 +0200

----------------------------------------------------------------------
 .travis.yml                                     |    2 +-
 deployment_admin/CMakeLists.txt                 |    6 +-
 framework/CMakeLists.txt                        |   82 +-
 framework/private/mock/bundle_context_mock.c    |   25 +-
 framework/private/mock/bundle_mock.c            |   13 +-
 framework/private/mock/framework_mock.c         |    6 +-
 framework/private/src/bundle_archive.c          |    2 +-
 framework/private/src/framework.c               |   53 +-
 framework/private/src/service_registration.c    |    6 +-
 framework/private/test/bundle_context_test.cpp  |   75 +-
 .../private/src/endpoint_discovery_poller.c     |  116 +-
 .../private/src/endpoint_discovery_server.c     |    3 +-
 .../discovery_etcd/private/src/discovery_impl.c |    1 -
 .../discovery_etcd/private/src/etcd_watcher.c   |   11 +-
 .../private/src/import_registration_impl.c      |    4 +-
 .../private/src/remote_proxy_factory_impl.c     |    6 +
 .../private/src/remote_service_admin_impl.c     |    5 +-
 .../topology_manager/private/src/activator.c    |    8 +-
 shell/private/src/help_command.c                |    2 +
 shell/private/src/inspect_command.c             |    6 +-
 shell/private/src/update_command.c              |    2 +-
 utils/CMakeLists.txt                            |   44 +-
 utils/private/src/hash_map.c                    |   57 +-
 utils/private/src/linked_list.c                 |    2 +-
 utils/private/test/array_list_test.c            |  357 -----
 utils/private/test/array_list_test.cpp          |  500 +++++-
 utils/private/test/celix_threads_test.cpp       |  346 ++++
 utils/private/test/hash_map_test.c              |  478 ------
 utils/private/test/hash_map_test.cpp            | 1492 ++++++++++++++++++
 utils/private/test/hash_map_test_hash.c         |  359 -----
 utils/private/test/linked_list_test.c           |   96 --
 utils/private/test/linked_list_test.cpp         |  794 ++++++++++
 utils/public/include/celix_threads.h            |    2 +-
 utils/public/include/hash_map.h                 |    4 +-
 utils/public/include/linked_list.h              |    2 +-
 35 files changed, 3403 insertions(+), 1564 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/119bb950/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index 3a3cfb7,1814464..3ecdf5c
--- a/.travis.yml
+++ b/.travis.yml
@@@ -9,21 -9,15 +9,21 @@@ matrix
      - compiler: gcc
      - compiler: clang
  
 -before_script: 
 -    - wget https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true
-O /tmp/cpputest.tar.gz
 -    - tar -xzvf /tmp/cpputest.tar.gz -C /tmp 
 -    - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-3.7.1
&& ./configure --prefix=$HOME/cpputest && make && make install &&
cd -
 +before_script:  
 +    - git clone -b 3.7.2 --single-branch https://github.com/cpputest/cpputest.git cpputest-build
 +    - cd cpputest-build
 +    - cmake . && make
 +    - sudo make install 
 +    - cd ..
 +    - git clone -b 2.7 --single-branch https://github.com/akheron/jansson.git jansson-build
 +    - cd jansson-build
 +    - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . && make
 +    - sudo make install
 +    - cd ..
      - mkdir build install
 -
 -script: 
      - cd build
 -    - 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=ON -DBUILD_UTILS-TESTS=ON
-DCPPUTEST_INCLUDE_DIR=$HOME/cpputest/include -DCPPUTEST_LIBRARY=$HOME/cpputest/lib/libCppUTest.a
-DCPPUTEST_EXT_INCLUDE_DIR=$HOME/cpputest/include -DCPPUTEST_EXT_LIBRARY=$HOME/cpputest/lib/libCppUTestExt.a
-DCMAKE_INSTALL_PREFIX=../install ..
 -    - make all && make deploy && make install-all
 -    - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils && ./utils/array_list_test
&& ./utils/celix_threads_test && ./utils/linked_list_test && ./utils/hash_map_test

 +    - cmake -DENABLE_TESTING=ON -DCMAKE_SKIP_BUILD_RPATH=TRUE -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 -DCMAKE_INSTALL_PREFIX=../install
..
  
 +script: 
 +    - make all 
-     - make test ARGS="-V"
++    - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils && make test ARGS="-V"

http://git-wip-us.apache.org/repos/asf/celix/blob/119bb950/framework/CMakeLists.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/celix/blob/119bb950/framework/private/src/framework.c
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/celix/blob/119bb950/framework/private/src/service_registration.c
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/celix/blob/119bb950/remote_services/discovery/private/src/endpoint_discovery_poller.c
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/celix/blob/119bb950/remote_services/remote_service_admin/private/src/import_registration_impl.c
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/celix/blob/119bb950/remote_services/remote_service_admin_http/private/src/remote_service_admin_impl.c
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/celix/blob/119bb950/utils/CMakeLists.txt
----------------------------------------------------------------------
diff --cc utils/CMakeLists.txt
index 859e8a5,c786e96..ce0811e
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@@ -52,7 -53,8 +53,8 @@@ if (UTILS
      INSTALL(FILES ${files} DESTINATION include/celix COMPONENT framework)
      
      celix_subproject(UTILS-TESTS "Option to build the utilities library tests" "OFF")
++
      if (UTILS-TESTS)
 -		
      	find_package(CppUTest REQUIRED)
  
  	    include_directories(${CUNIT_INCLUDE_DIRS})


Mime
View raw message