This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/604-global-initialization-of-curl in repository https://gitbox.apache.org/repos/asf/celix.git
commit 0e54fa790389e8b40c22049f08fa34c8340791ed Merge: f6af3211 eb30eb5a Author: PengZheng <[email protected]> AuthorDate: Thu Aug 10 12:02:26 2023 +0800 Merge branch 'master' into feature/604-global-initialization-of-curl # Conflicts: # conanfile.py bundles/pubsub/pubsub_utils/src/pubsub_utils.c | 5 +- .../discovery_common/src/discovery.c | 8 +- .../remote_services/topology_manager/src/scope.c | 10 +- .../topology_manager/src/topology_manager.c | 12 +- cmake/cmake_celix/BundlePackaging.cmake | 322 ++++++++++++--------- conanfile.py | 4 +- libs/framework/src/bundle_context.c | 8 +- libs/framework/src/framework.c | 21 +- libs/framework/src/service_registry.c | 17 +- libs/utils/gtest/src/FilterTestSuite.cc | 4 + libs/utils/gtest/src/VersionRangeTestSuite.cc | 4 + libs/utils/include/celix_filter.h | 3 + libs/utils/include/celix_version_range.h | 3 + misc/experimental/rust/CMakeLists.txt | 11 +- misc/experimental/rust/Cargo.toml | 1 + misc/experimental/rust/README.md | 23 ++ .../Cargo.toml | 12 +- misc/experimental/rust/celix_bindings/build.rs | 65 +++++ .../lib.rs => celix_bindings/src/celix_bindings.h} | 22 +- misc/experimental/rust/celix_bindings/src/lib.rs | 41 +++ .../rust/hello_world_activator/Cargo.toml | 6 +- .../rust/hello_world_activator/src/lib.rs | 87 +++++- 22 files changed, 474 insertions(+), 215 deletions(-) diff --cc conanfile.py index 10a66f65,e863acae..73f679c2 --- a/conanfile.py +++ b/conanfile.py @@@ -383,12 -381,9 +383,12 @@@ class CelixConan(ConanFile) self.requires("libzip/[>=1.7.3 <2.0.0]") self.options['libzip'].shared = True if self.options.build_framework or self.options.build_pubsub: - self.requires("libuuid/1.0.3") - self.options['libuuid'].shared = True + self.requires("util-linux-libuuid/2.39") + self.options['util-linux-libuuid'].shared = True - if self.options.build_framework or self.options.build_celix_etcdlib: + if ((self.options.build_framework and self.options.framework_curlinit) + or self.options.build_celix_etcdlib or self.options.build_deployment_admin + or self.options.build_rsa_discovery_common or self.options.build_rsa_remote_service_admin_dfi + or self.options.build_launcher): self.requires("libcurl/[>=7.64.1 <8.0.0]") self.options['libcurl'].shared = True if self.options.build_deployment_admin:
