This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git
commit d40cada23f12b2ee33e0a4958c270a18b9572aa7 Merge: f40d68de c789b89f Author: PengZheng <[email protected]> AuthorDate: Mon Jul 31 09:52:48 2023 +0800 Merge pull request #589 from apache/feature/579-automatic-dependency-deduction Feature/579 automatic dependency deduction .github/workflows/conan_create.yml | 71 +++++ .github/workflows/macos.yml | 5 +- .github/workflows/ubuntu.yml | 11 +- 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 +- 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 +- cmake/Modules/FindDNSSD.cmake | 49 +++ cmake/Modules/Findlibuuid.cmake | 18 +- cmake/celix_project/CodeCoverage.cmake | 2 +- conanfile.py | 287 +++++++++++++----- 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 | 92 +++++- examples/conan_test_package/conanfile.py | 55 +++- 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 | 12 +- 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 | 133 +++++---- .../framework/error_injector}/CMakeLists.txt | 13 +- .../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 libs/framework/src/celix_launcher.c | 2 +- libs/pushstreams/CMakeLists.txt | 3 +- libs/rcm/CMakeLists.txt | 37 +-- libs/utils/CMakeLists.txt | 329 +++++++++++---------- .../utils/error_injector}/CMakeLists.txt | 19 +- .../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 - 135 files changed, 1411 insertions(+), 946 deletions(-)
