This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch feature/585-celix-conditions
in repository https://gitbox.apache.org/repos/asf/celix.git
from 5f77f428 Relax timing requirements for CI testing on macos
add 7c65bfce [#595] fix use-after-free caused by cancelled service tracker.
add d2145223 Merge pull request #596 from
apache/hotfix/595-use-after-free-caused-by-cancelled-tracker
add 44302924 Refactor celix_container_bundles_dir to use add_custom_target
add 86463948 Enable ninja build for ubuntu-build-conan.
add fba77680 Fix typo in CONAN_CMAKE_GENERATOR setting.
add 3b55bfb4 Install ninja-build for ubuntu-build-conan.
add 8bcac0f2 Merge pull request #594 from
apache/hotfix/container_bundle_copies_do_not_trigger
add 3a8d65ba Remove incorrect ">" postfix for BUNDLE_ACTIVATOR value in
BundlePackaging
add f40d68de Merge pull request #598 from
apache/hotfix/bnd_activator_name_typo_in_bundlepackaging
add cda603c8 Turn on build_all option when testing installed Celix.
add f0345ccc mDNSResponder does not compile on MacOS.
add 0979ee3c Fix typo.
add 58d06789 All build_ options are off by default so that users do not
get what they do not need.
add 0c216c80 Add missing build options.
add 7eef42ed Merge branch 'master' into
feature/579-automatic-dependency-deduction
add 096e19f7 Add options for log/shell api and log helper.
add e21fcae9 Add automatic dependency deduction to shell/log/pubsub and
improve cmake dependency specification.
add 9bc9aea8 Fix compilation error.
add d3ba7873 Use mDNSResponder package which supports cross-compilation.
add ba204b16 Improve deprecated header dependency specification.
add 276afafe Improve dependency specification of RSA.
add 55431197 Merge branch 'master' into
feature/579-automatic-dependency-deduction
add 46915e07 Add automatic dependency deduction to RSA.
add ecd5195f Add automatic dependency deduction to remaining libs.
add 277e537e Fix `conan create` errors.
add c09b8e68 Add automatic dependency deduction to examples, and remove
DEPS from celix_subproject.
add dbebb570 Add missing dependency specifications.
add 2451c522 Update test_package to use celix API.
add 28e0fdfa Add missing test_package.
add 7325fe4f Use homebrew's libuuid.
add d1332ed9 Use macOS's native libuuid.
add 6b8f1166 Use mdnsresponder/1310.140.1
add ac3c1ce5 Replace c99 with gnu99.
add 9ced95bb Use POSIX extension.
add 2c060bd6 Revert "Use POSIX extension."
add 09edc8a7 Use macOS-11 for build-brew.
add fd2c5f23 Recover Findlibuuid.cmake
add 3a363187 Recover Findlibuuid.cmake
add f3597df9 Recover Findlibuuid.cmake
add 586e7b97 Add missing FindDNSSD.cmake
add f8bb0187 Modularize error injectors.
add 2ab598f7 Add conan create CI test.
add 7b184f22 Add install step for conan create CI test.
add 12094ffd Remove unnecessary find_package(CURL REQUIRED) when opting
out etcd.
add 2870ad5e Fix zlib conflict for conan create CI test.
add 5ce50374 Add mac-build for conan create CI test.
add f90b9ad7 Fix build profile for mac-build of conan create CI test.
add 97c65841 Fix find_package(CURL REQUIRED) for standalone etcd build.
add ebac4777 Update standalone etcd to use cmake 3.18.
add 3edeabb6 Update the way of setup environment variables for CLion.
add 049e1df1 Exclude error_injector from Coverage.
add d908cfe6 Rename error injects to exclude them from Coverage.
add 76d1f2bc Merge branch 'master' into
feature/579-automatic-dependency-deduction
add c789b89f Enable ninja build for conan create.
add d40cada2 Merge pull request #589 from
apache/feature/579-automatic-dependency-deduction
add efc629d5 Merge branch 'master' into feature/585-celix-conditions
add 43a91316 Add missing intra-package dependency deduction and test
package.
No new revisions were added by this update.
Summary of changes:
.github/workflows/conan_create.yml | 71 +++++
.github/workflows/macos.yml | 3 -
.github/workflows/ubuntu.yml | 10 +-
CMakeLists.txt | 32 +-
.../cxx_remote_services/integration/CMakeLists.txt | 6 +-
.../integration/gtest/CMakeLists.txt | 2 +-
bundles/cxx_remote_services/rsa_spi/CMakeLists.txt | 1 +
bundles/logging/log_admin/CMakeLists.txt | 2 +-
bundles/logging/log_admin/gtest/CMakeLists.txt | 2 +-
bundles/logging/log_helper/CMakeLists.txt | 60 ++--
.../log_helper/error_injector}/CMakeLists.txt | 2 +-
.../error_injector}/include/celix_log_helper_ei.h | 0
.../error_injector}/src/celix_log_helper_ei.cc | 0
bundles/logging/log_service_api/CMakeLists.txt | 34 ++-
.../log_service_api/include/celix_log_control.h | 1 +
.../log_writers/syslog_writer/CMakeLists.txt | 2 +-
.../log_writers/syslog_writer/gtest/CMakeLists.txt | 2 +-
bundles/pubsub/CMakeLists.txt | 2 +-
bundles/pubsub/examples/CMakeLists.txt | 28 +-
.../examples/pubsub/interceptors/CMakeLists.txt | 2 +-
.../examples/pubsub/publisher/CMakeLists.txt | 2 +-
.../examples/pubsub/publisher2/CMakeLists.txt | 2 +-
.../pubsub/pubsub_websocket/CMakeLists.txt | 5 +-
.../examples/pubsub/subscriber/CMakeLists.txt | 2 +-
bundles/pubsub/integration/CMakeLists.txt | 41 +--
bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt | 7 +-
bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 5 +-
.../pubsub/pubsub_admin_websocket/CMakeLists.txt | 9 +-
bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 3 +-
bundles/pubsub/pubsub_api/CMakeLists.txt | 1 +
bundles/pubsub/pubsub_discovery/CMakeLists.txt | 7 +-
.../pubsub_protocol_wire_v1/CMakeLists.txt | 51 ++--
.../pubsub_protocol_wire_v2/CMakeLists.txt | 45 +--
.../pubsub_serializer_avrobin/CMakeLists.txt | 50 ++--
.../pubsub/pubsub_serializer_json/CMakeLists.txt | 48 +--
.../pubsub/pubsub_utils/include/pubsub_utils_url.h | 2 +
bundles/remote_services/CMakeLists.txt | 4 +-
.../discovery_common/CMakeLists.txt | 49 ++-
.../{include => src}/endpoint_descriptor_common.h | 0
.../discovery_configured/CMakeLists.txt | 14 +-
.../remote_services/discovery_etcd/CMakeLists.txt | 20 +-
.../discovery_etcd/src/etcd_watcher.c | 3 +-
.../remote_services/discovery_shm/CMakeLists.txt | 6 +-
.../src/discovery_zeroconf_watcher.c | 3 +-
bundles/remote_services/examples/CMakeLists.txt | 5 +-
.../remote_service_admin_dfi/gtest/CMakeLists.txt | 2 -
.../gtest/client.properties.in | 2 +-
.../remote_service_admin_shm_v2/CMakeLists.txt | 1 +
.../rsa_shm/CMakeLists.txt | 1 +
.../rsa_shm/gtest/CMakeLists.txt | 3 +-
.../thpool/CMakeLists.txt | 0
.../thpool/LICENSE | 0
.../thpool/README.md | 0
.../thpool/include/thpool.h | 0
.../thpool/src/thpool.c | 0
bundles/remote_services/rsa_spi/CMakeLists.txt | 3 -
.../topology_manager/CMakeLists.txt | 2 +-
.../tms_tst/disc_mock/CMakeLists.txt | 4 +-
bundles/shell/remote_shell/CMakeLists.txt | 2 +-
bundles/shell/shell/CMakeLists.txt | 136 ++++-----
bundles/shell/shell_bonjour/CMakeLists.txt | 14 +-
bundles/shell/shell_tui/CMakeLists.txt | 2 +-
bundles/shell/shell_wui/CMakeLists.txt | 2 +-
cmake/CelixConfig.cmake | 33 +--
cmake/CelixDeps.cmake.in | 14 +-
.../Modules/{Findlibzip.cmake => FindDNSSD.cmake} | 34 +--
cmake/Modules/Findlibuuid.cmake | 18 +-
cmake/celix_project/CodeCoverage.cmake | 2 +-
cmake/cmake_celix/BundlePackaging.cmake | 2 +-
cmake/cmake_celix/ContainerPackaging.cmake | 88 +++---
conanfile.py | 290 +++++++++++++-----
documents/building/dev_celix_with_clion.md | 2 +-
examples/celix-examples/CMakeLists.txt | 2 +-
examples/celix-examples/dm_example/CMakeLists.txt | 1 -
examples/conan_test_package/CMakeLists.txt | 97 +++++-
examples/conan_test_package/conanfile.py | 59 +++-
examples/conan_test_package/hello_bundle.c | 11 +-
.../conan_test_package/my_log_writer_activator.c | 9 +-
examples/conan_test_package/my_psa_activator.c | 6 +-
examples/conan_test_package/my_rsa_activator.c | 4 +-
examples/conan_test_package/test_celix_dfi.c | 25 ++
examples/conan_test_package/test_cxx_shell.cpp | 14 +-
examples/conan_test_package/test_framework.c | 15 +-
.../conan_test_package/test_http_admin_activator.c | 22 +-
examples/conan_test_package/test_log_helper.c | 43 +++
examples/conan_test_package/test_log_service_api.c | 25 ++
examples/conan_test_package/test_rsa_spi.cc | 25 ++
examples/conan_test_package/test_shell.c | 18 +-
examples/conan_test_package/test_shell_api.c | 26 ++
examples/conan_test_package/test_utils.c | 28 ++
libs/dependency_manager/CMakeLists.txt | 65 ++--
libs/dependency_manager_cxx/CMakeLists.txt | 36 +--
libs/dfi/CMakeLists.txt | 3 +
.../dfi/error_injector/CMakeLists.txt | 6 +-
libs/{ => dfi}/error_injector/dfi/CMakeLists.txt | 2 +-
libs/{ => dfi}/error_injector/dfi/include/dfi_ei.h | 0
libs/{ => dfi}/error_injector/dfi/src/dfi_ei.cc | 0
libs/error_injector/CMakeLists.txt | 15 -
libs/etcdlib/CMakeLists.txt | 18 +-
libs/framework/CMakeLists.txt | 135 +++++----
.../framework/error_injector/CMakeLists.txt | 6 +-
.../error_injector/celix_bundle/CMakeLists.txt | 2 +-
.../celix_bundle/include/celix_bundle_ei.h | 0
.../celix_bundle/src/celix_bundle_ei.cc | 0
.../error_injector/celix_bundle_ctx/CMakeLists.txt | 2 +-
.../include/celix_bundle_context_ei.h | 0
.../src/celix_bundle_context_ei.cc | 0
.../framework/include_deprecated/service_tracker.h | 9 +
libs/framework/src/bundle_context.c | 27 +-
libs/framework/src/celix_launcher.c | 2 +-
libs/framework/src/service_tracker.c | 45 ++-
libs/pushstreams/CMakeLists.txt | 3 +-
libs/rcm/CMakeLists.txt | 37 +--
libs/utils/CMakeLists.txt | 329 +++++++++++----------
.../utils/error_injector}/CMakeLists.txt | 13 +-
.../error_injector/celix_array_list/CMakeLists.txt | 2 +-
.../celix_array_list/include/celix_array_list_ei.h | 0
.../celix_array_list/src/celix_array_list_ei.cc | 0
.../error_injector/celix_hash_map/CMakeLists.txt | 2 +-
.../celix_hash_map/include/celix_hash_map_ei.h | 0
.../celix_hash_map/src/celix_hash_map_ei.cc | 0
.../celix_long_hash_map/CMakeLists.txt | 2 +-
.../include/celix_long_hash_map_ei.h | 0
.../src/celix_long_hash_map_ei.cc | 0
.../error_injector/celix_properties/CMakeLists.txt | 2 +-
.../celix_properties/include/celix_properties_ei.h | 0
.../celix_properties/src/celix_properties_ei.cc | 0
.../error_injector/celix_threads/CMakeLists.txt | 2 +-
.../celix_threads/include/celix_threads_ei.h | 0
.../celix_threads/src/celix_threads_ei.cc | 0
.../error_injector/celix_utils/CMakeLists.txt | 2 +-
.../celix_utils/include/celix_utils_ei.h | 0
.../celix_utils/src/celix_utils_ei.cc | 0
.../error_injector/celix_version/CMakeLists.txt | 2 +-
.../celix_version/include/celix_version_ei.h | 0
.../celix_version/src/celix_version_ei.cc | 0
libs/{ => utils}/error_injector/zip/CMakeLists.txt | 3 +-
.../error_injector/zip/include/zip_ei.h | 0
libs/{ => utils}/error_injector/zip/src/zip_ei.cc | 0
.../bundles/event_admin/CMakeLists.txt | 2 +-
.../bundles/pubsub_admin_nanomsg/CMakeLists.txt | 1 -
141 files changed, 1484 insertions(+), 1024 deletions(-)
create mode 100644 .github/workflows/conan_create.yml
rename {libs/error_injector/celix_log_helper =>
bundles/logging/log_helper/error_injector}/CMakeLists.txt (93%)
rename {libs/error_injector/celix_log_helper =>
bundles/logging/log_helper/error_injector}/include/celix_log_helper_ei.h (100%)
rename {libs/error_injector/celix_log_helper =>
bundles/logging/log_helper/error_injector}/src/celix_log_helper_ei.cc (100%)
rename bundles/remote_services/discovery_common/{include =>
src}/endpoint_descriptor_common.h (100%)
rename bundles/remote_services/{ =>
remote_service_admin_shm_v2}/thpool/CMakeLists.txt (100%)
rename bundles/remote_services/{ =>
remote_service_admin_shm_v2}/thpool/LICENSE (100%)
rename bundles/remote_services/{ =>
remote_service_admin_shm_v2}/thpool/README.md (100%)
rename bundles/remote_services/{ =>
remote_service_admin_shm_v2}/thpool/include/thpool.h (100%)
rename bundles/remote_services/{ =>
remote_service_admin_shm_v2}/thpool/src/thpool.c (100%)
copy cmake/Modules/{Findlibzip.cmake => FindDNSSD.cmake} (61%)
create mode 100644 examples/conan_test_package/test_celix_dfi.c
create mode 100644 examples/conan_test_package/test_log_helper.c
create mode 100644 examples/conan_test_package/test_log_service_api.c
create mode 100644 examples/conan_test_package/test_rsa_spi.cc
create mode 100644 examples/conan_test_package/test_shell_api.c
create mode 100644 examples/conan_test_package/test_utils.c
copy bundles/pubsub/examples/keys/subscriber/private/.gitkeep =>
libs/dfi/error_injector/CMakeLists.txt (96%)
rename libs/{ => dfi}/error_injector/dfi/CMakeLists.txt (93%)
rename libs/{ => dfi}/error_injector/dfi/include/dfi_ei.h (100%)
rename libs/{ => dfi}/error_injector/dfi/src/dfi_ei.cc (100%)
copy codecov.yml => libs/framework/error_injector/CMakeLists.txt (92%)
rename libs/{ => framework}/error_injector/celix_bundle/CMakeLists.txt (93%)
rename libs/{ =>
framework}/error_injector/celix_bundle/include/celix_bundle_ei.h (100%)
rename libs/{ => framework}/error_injector/celix_bundle/src/celix_bundle_ei.cc
(100%)
rename libs/{ => framework}/error_injector/celix_bundle_ctx/CMakeLists.txt
(95%)
rename libs/{ =>
framework}/error_injector/celix_bundle_ctx/include/celix_bundle_context_ei.h
(100%)
rename libs/{ =>
framework}/error_injector/celix_bundle_ctx/src/celix_bundle_context_ei.cc (100%)
copy {bundles/shell => libs/utils/error_injector}/CMakeLists.txt (75%)
rename libs/{ => utils}/error_injector/celix_array_list/CMakeLists.txt (94%)
rename libs/{ =>
utils}/error_injector/celix_array_list/include/celix_array_list_ei.h (100%)
rename libs/{ =>
utils}/error_injector/celix_array_list/src/celix_array_list_ei.cc (100%)
rename libs/{ => utils}/error_injector/celix_hash_map/CMakeLists.txt (92%)
rename libs/{ =>
utils}/error_injector/celix_hash_map/include/celix_hash_map_ei.h (100%)
rename libs/{ => utils}/error_injector/celix_hash_map/src/celix_hash_map_ei.cc
(100%)
rename libs/{ => utils}/error_injector/celix_long_hash_map/CMakeLists.txt (92%)
rename libs/{ =>
utils}/error_injector/celix_long_hash_map/include/celix_long_hash_map_ei.h
(100%)
rename libs/{ =>
utils}/error_injector/celix_long_hash_map/src/celix_long_hash_map_ei.cc (100%)
rename libs/{ => utils}/error_injector/celix_properties/CMakeLists.txt (93%)
rename libs/{ =>
utils}/error_injector/celix_properties/include/celix_properties_ei.h (100%)
rename libs/{ =>
utils}/error_injector/celix_properties/src/celix_properties_ei.cc (100%)
rename libs/{ => utils}/error_injector/celix_threads/CMakeLists.txt (94%)
rename libs/{ =>
utils}/error_injector/celix_threads/include/celix_threads_ei.h (100%)
rename libs/{ => utils}/error_injector/celix_threads/src/celix_threads_ei.cc
(100%)
rename libs/{ => utils}/error_injector/celix_utils/CMakeLists.txt (94%)
rename libs/{ => utils}/error_injector/celix_utils/include/celix_utils_ei.h
(100%)
rename libs/{ => utils}/error_injector/celix_utils/src/celix_utils_ei.cc (100%)
rename libs/{ => utils}/error_injector/celix_version/CMakeLists.txt (93%)
rename libs/{ =>
utils}/error_injector/celix_version/include/celix_version_ei.h (100%)
rename libs/{ => utils}/error_injector/celix_version/src/celix_version_ei.cc
(100%)
rename libs/{ => utils}/error_injector/zip/CMakeLists.txt (93%)
rename libs/{ => utils}/error_injector/zip/include/zip_ei.h (100%)
rename libs/{ => utils}/error_injector/zip/src/zip_ei.cc (100%)
