[celix] branch feature/604-global-initialization-of-curl deleted (was 90cf85ce)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/604-global-initialization-of-curl in repository https://gitbox.apache.org/repos/asf/celix.git was 90cf85ce Typo fix. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[celix] branch master updated (eb30eb5a -> 6cde7b48)
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
from eb30eb5a Merge pull request #609 from apache/feature/more-auto-cleanup
add f243a11e Specify all components that depend on libcurl.
add 3d47c4a4 Update all container needing curl initialization to use
Celix::launcher.
add b933b6bb Fix test_package error.
add abca2390 Make libcurl an optional dependency of framework.
add c48b0bc0 Make curl a mandatory dependency of Celix::launcher.
add f6af3211 Merge branch 'master' into
feature/604-global-initialization-of-curl
add 0e54fa79 Merge branch 'master' into
feature/604-global-initialization-of-curl
add 90cf85ce Typo fix.
new 6cde7b48 Merge pull request #610 from
apache/feature/604-global-initialization-of-curl
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/macos.yml| 1 +
.github/workflows/ubuntu.yml | 1 +
.../cxx_remote_services/integration/CMakeLists.txt | 80 --
bundles/deployment_admin/CMakeLists.txt| 4 +-
bundles/pubsub/examples/CMakeLists.txt | 40 +--
bundles/remote_services/CMakeLists.txt | 18 -
.../remote_service_admin_dfi/gtest/src/main.cc | 3 +
.../topology_manager/tms_tst/CMakeLists.txt| 5 +-
.../topology_manager/tms_tst}/main.cc | 3 +
cmake/CelixDeps.cmake.in | 4 +-
cmake/cmake_celix/ContainerPackaging.cmake | 7 +-
conanfile.py | 7 +-
examples/conan_test_package/CMakeLists.txt | 56 +--
examples/conan_test_package/conanfile.py | 8 +--
examples/conan_test_package/test_etcd_lib.c| 2 +-
libs/framework/CMakeLists.txt | 21 --
libs/framework/gtest/CMakeLists.txt| 6 +-
libs/framework/src/celix_launcher.c| 4 --
libs/launcher/CMakeLists.txt | 6 +-
libs/launcher/src/main.c | 7 +-
20 files changed, 210 insertions(+), 73 deletions(-)
copy bundles/{pubsub/pubsub_protocol/pubsub_protocol_wire_v1/gtest/src =>
remote_services/topology_manager/tms_tst}/main.cc (91%)
[celix] 01/01: Merge pull request #610 from apache/feature/604-global-initialization-of-curl
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 6cde7b48e6d6e34b22eee7d3f9fa73aa93d1663d Merge: eb30eb5a 90cf85ce Author: PengZheng AuthorDate: Thu Aug 10 12:26:04 2023 +0800 Merge pull request #610 from apache/feature/604-global-initialization-of-curl Feature/604 global initialization of curl .github/workflows/macos.yml| 1 + .github/workflows/ubuntu.yml | 1 + .../cxx_remote_services/integration/CMakeLists.txt | 80 -- bundles/deployment_admin/CMakeLists.txt| 4 +- bundles/pubsub/examples/CMakeLists.txt | 40 +-- bundles/remote_services/CMakeLists.txt | 18 - .../remote_service_admin_dfi/gtest/src/main.cc | 3 + .../topology_manager/tms_tst/CMakeLists.txt| 5 +- .../gtest/src => topology_manager/tms_tst}/main.cc | 3 + cmake/CelixDeps.cmake.in | 4 +- cmake/cmake_celix/ContainerPackaging.cmake | 7 +- conanfile.py | 7 +- examples/conan_test_package/CMakeLists.txt | 56 +-- examples/conan_test_package/conanfile.py | 8 +-- examples/conan_test_package/test_etcd_lib.c| 2 +- libs/framework/CMakeLists.txt | 21 -- libs/framework/gtest/CMakeLists.txt| 6 +- libs/framework/src/celix_launcher.c| 4 -- libs/launcher/CMakeLists.txt | 6 +- libs/launcher/src/main.c | 7 +- 20 files changed, 210 insertions(+), 73 deletions(-)
[celix] 02/02: Typo fix.
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 90cf85ce2a043d1c370812e64023cce66609b1e8 Author: PengZheng AuthorDate: Thu Aug 10 12:07:35 2023 +0800 Typo fix. --- cmake/CelixDeps.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/CelixDeps.cmake.in b/cmake/CelixDeps.cmake.in index 7893ef4a..53815363 100644 --- a/cmake/CelixDeps.cmake.in +++ b/cmake/CelixDeps.cmake.in @@ -6,7 +6,7 @@ $<$>:find_dependency(ZLIB) $<$>:find_dependency(libffi)> $<$>:find_dependency(jansson)> $<$>:find_dependency(jansson)> -$<$>:find_dependency(CURL)> +$<$>:find_dependency(CURL)> $<$>:find_dependency(CURL)> $<$>:find_dependency(CURL)> $<$>:find_dependency(CURL)>
[celix] 01/02: Merge branch 'master' into feature/604-global-initialization-of-curl
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
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:
[celix] branch feature/604-global-initialization-of-curl updated (f6af3211 -> 90cf85ce)
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch feature/604-global-initialization-of-curl
in repository https://gitbox.apache.org/repos/asf/celix.git
from f6af3211 Merge branch 'master' into
feature/604-global-initialization-of-curl
add eec29e2f [#607] make installed bundle use INSTALL_RPATH.
add c4544711 Remove unnecessary BUILD_RPATH setting.
add 84ac9a4d Merge pull request #608 from
apache/hotfix/ensure-origin-rpath-for-bnd-activator-lib
add a7581acb Switch to util-linux-libuuid to avoid conflict with other
conan package.
add ddcb4bee Merge pull request #611 from apache/hotfix/libuuid-switch
add 0d7c48f0 599: Add celix_bindings rust lib
add 36b67ea9 599: Update rust bundle to use celix_bindings
add 035593fe 599: Update misc/experimental/rust readme
add 5281a395 Merge pull request #603 from
apache/feature/599-add-rust-bindings
add 6dc67486 Add autocleanup for celix_filter.
add 7311ec55 Add autocleanup for celix_version_range.
add eb30eb5a Merge pull request #609 from apache/feature/more-auto-cleanup
new 0e54fa79 Merge branch 'master' into
feature/604-global-initialization-of-curl
new 90cf85ce Typo fix.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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/CelixDeps.cmake.in | 2 +-
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 +
.../rust/celix_bindings/src/celix_bindings.h | 23 +-
.../experimental/rust/celix_bindings/src/lib.rs| 46 ++-
.../rust/hello_world_activator/Cargo.toml | 6 +-
.../rust/hello_world_activator/src/lib.rs | 87 +-
23 files changed, 455 insertions(+), 242 deletions(-)
copy misc/experimental/rust/{hello_world_activator =>
celix_bindings}/Cargo.toml (84%)
create mode 100644 misc/experimental/rust/celix_bindings/build.rs
copy bundles/logging/log_service_api/include_v2/log_listener.h =>
misc/experimental/rust/celix_bindings/src/celix_bindings.h (72%)
copy bundles/http_admin/http_admin/src/http_admin_constants.h =>
misc/experimental/rust/celix_bindings/src/lib.rs (50%)
[celix] 01/01: Merge pull request #609 from apache/feature/more-auto-cleanup
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 eb30eb5a0fcb195995e2ec31ea4fb07f0d6f52d5 Merge: 5281a395 7311ec55 Author: PengZheng AuthorDate: Thu Aug 10 09:24:12 2023 +0800 Merge pull request #609 from apache/feature/more-auto-cleanup Feature/more auto cleanup 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 +++- 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 +++ 11 files changed, 42 insertions(+), 53 deletions(-)
[celix] branch master updated (5281a395 -> eb30eb5a)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from 5281a395 Merge pull request #603 from apache/feature/599-add-rust-bindings add 6dc67486 Add autocleanup for celix_filter. add 7311ec55 Add autocleanup for celix_version_range. new eb30eb5a Merge pull request #609 from apache/feature/more-auto-cleanup The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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 +++- 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 +++ 11 files changed, 42 insertions(+), 53 deletions(-)
[celix] branch feature/more-auto-cleanup deleted (was 7311ec55)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch feature/more-auto-cleanup in repository https://gitbox.apache.org/repos/asf/celix.git was 7311ec55 Add autocleanup for celix_version_range. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[celix] branch master updated (5281a395 -> eb30eb5a)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from 5281a395 Merge pull request #603 from apache/feature/599-add-rust-bindings add 6dc67486 Add autocleanup for celix_filter. add 7311ec55 Add autocleanup for celix_version_range. new eb30eb5a Merge pull request #609 from apache/feature/more-auto-cleanup The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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 +++- 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 +++ 11 files changed, 42 insertions(+), 53 deletions(-)
[celix] 01/01: Merge pull request #609 from apache/feature/more-auto-cleanup
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 eb30eb5a0fcb195995e2ec31ea4fb07f0d6f52d5 Merge: 5281a395 7311ec55 Author: PengZheng AuthorDate: Thu Aug 10 09:24:12 2023 +0800 Merge pull request #609 from apache/feature/more-auto-cleanup Feature/more auto cleanup 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 +++- 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 +++ 11 files changed, 42 insertions(+), 53 deletions(-)
[celix] branch feature/allow_duplicate_bundles_in_container updated (d69ba723 -> bfe9ed8a)
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a change to branch feature/allow_duplicate_bundles_in_container
in repository https://gitbox.apache.org/repos/asf/celix.git
from d69ba723 Add warning for duplicate embedded bundles in a container.
add af911849 Add to BUILD_PATH
add 8695bd78 Merge pull request #606 from
apache/hotfix/ensure-origin-rpath-for-bnd-activator-lib
add eec29e2f [#607] make installed bundle use INSTALL_RPATH.
add c4544711 Remove unnecessary BUILD_RPATH setting.
add 84ac9a4d Merge pull request #608 from
apache/hotfix/ensure-origin-rpath-for-bnd-activator-lib
add a7581acb Switch to util-linux-libuuid to avoid conflict with other
conan package.
add ddcb4bee Merge pull request #611 from apache/hotfix/libuuid-switch
add 0d7c48f0 599: Add celix_bindings rust lib
add 36b67ea9 599: Update rust bundle to use celix_bindings
add 035593fe 599: Update misc/experimental/rust readme
add 5281a395 Merge pull request #603 from
apache/feature/599-add-rust-bindings
add bfe9ed8a Merge remote-tracking branch 'origin/master' into
feature/allow_duplicate_bundles_in_container
No new revisions were added by this update.
Summary of changes:
cmake/cmake_celix/BundlePackaging.cmake| 320 -
conanfile.py | 4 +-
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 +
.../rust/celix_bindings/src/celix_bindings.h | 23 +-
.../experimental/rust/celix_bindings/src/lib.rs| 46 ++-
.../rust/hello_world_activator/Cargo.toml | 6 +-
.../rust/hello_world_activator/src/lib.rs | 87 +-
11 files changed, 412 insertions(+), 186 deletions(-)
copy misc/experimental/rust/{hello_world_activator =>
celix_bindings}/Cargo.toml (84%)
create mode 100644 misc/experimental/rust/celix_bindings/build.rs
copy bundles/logging/log_service_api/include_v2/log_listener.h =>
misc/experimental/rust/celix_bindings/src/celix_bindings.h (72%)
copy bundles/http_admin/http_admin/src/http_admin_constants.h =>
misc/experimental/rust/celix_bindings/src/lib.rs (50%)
[celix] branch feature/599-add-rust-bindings deleted (was 035593fe)
This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a change to branch feature/599-add-rust-bindings in repository https://gitbox.apache.org/repos/asf/celix.git was 035593fe 599: Update misc/experimental/rust readme The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[celix] branch master updated (ddcb4bee -> 5281a395)
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
from ddcb4bee Merge pull request #611 from apache/hotfix/libuuid-switch
add 0d7c48f0 599: Add celix_bindings rust lib
add 36b67ea9 599: Update rust bundle to use celix_bindings
add 035593fe 599: Update misc/experimental/rust readme
new 5281a395 Merge pull request #603 from
apache/feature/599-add-rust-bindings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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
.../rust/celix_bindings/src/celix_bindings.h | 23 +++---
.../experimental/rust/celix_bindings/src/lib.rs| 46 ++--
.../rust/hello_world_activator/Cargo.toml | 6 +-
.../rust/hello_world_activator/src/lib.rs | 87 --
9 files changed, 224 insertions(+), 50 deletions(-)
copy misc/experimental/rust/{hello_world_activator =>
celix_bindings}/Cargo.toml (84%)
create mode 100644 misc/experimental/rust/celix_bindings/build.rs
copy bundles/logging/log_service_api/include_v2/log_listener.h =>
misc/experimental/rust/celix_bindings/src/celix_bindings.h (72%)
copy bundles/http_admin/http_admin/src/http_admin_constants.h =>
misc/experimental/rust/celix_bindings/src/lib.rs (50%)
[celix] 01/01: Merge pull request #603 from apache/feature/599-add-rust-bindings
This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 5281a39575a5085b1fb2939004022ae9cf8d6ec3 Merge: ddcb4bee 035593fe Author: Pepijn Noltes AuthorDate: Wed Aug 9 16:00:31 2023 +0200 Merge pull request #603 from apache/feature/599-add-rust-bindings Feature/599 add rust bindings 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 -- 9 files changed, 244 insertions(+), 24 deletions(-)
[celix] branch feature/allow_duplicate_bundles_in_container updated (a2867329 -> d69ba723)
This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a change to branch feature/allow_duplicate_bundles_in_container in repository https://gitbox.apache.org/repos/asf/celix.git from a2867329 Extend cmake warnings test and fix container package error add d69ba723 Add warning for duplicate embedded bundles in a container. No new revisions were added by this update. Summary of changes: cmake/celix_project/WarningTests.cmake | 30 -- cmake/cmake_celix/ContainerPackaging.cmake | 20 +--- 2 files changed, 37 insertions(+), 13 deletions(-)
[celix] 01/01: Merge pull request #611 from apache/hotfix/libuuid-switch
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 ddcb4bee79ac3219d70e53016e98d366f76d316b Merge: 84ac9a4d a7581acb Author: PengZheng AuthorDate: Wed Aug 9 20:10:37 2023 +0800 Merge pull request #611 from apache/hotfix/libuuid-switch Hotfox/libuuid conflict conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[celix] branch master updated (84ac9a4d -> ddcb4bee)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from 84ac9a4d Merge pull request #608 from apache/hotfix/ensure-origin-rpath-for-bnd-activator-lib add a7581acb Switch to util-linux-libuuid to avoid conflict with other conan package. new ddcb4bee Merge pull request #611 from apache/hotfix/libuuid-switch The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[celix] branch hotfix/libuuid-switch deleted (was a7581acb)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/libuuid-switch in repository https://gitbox.apache.org/repos/asf/celix.git was a7581acb Switch to util-linux-libuuid to avoid conflict with other conan package. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[celix] branch hotfix/libuuid-switch created (now a7581acb)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/libuuid-switch in repository https://gitbox.apache.org/repos/asf/celix.git at a7581acb Switch to util-linux-libuuid to avoid conflict with other conan package. This branch includes the following new commits: new a7581acb Switch to util-linux-libuuid to avoid conflict with other conan package. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[celix] 01/01: Switch to util-linux-libuuid to avoid conflict with other conan package.
This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch hotfix/libuuid-switch
in repository https://gitbox.apache.org/repos/asf/celix.git
commit a7581acb60df8bbcd23fd4a6819a006e941d99a8
Author: PengZheng
AuthorDate: Wed Aug 9 19:17:14 2023 +0800
Switch to util-linux-libuuid to avoid conflict with other conan package.
---
conanfile.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/conanfile.py b/conanfile.py
index aa8444ee..e863acae 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -381,8 +381,8 @@ 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:
self.requires("libcurl/[>=7.64.1 <8.0.0]")
self.options['libcurl'].shared = True
[celix] branch hotfix/ensure-origin-rpath-for-bnd-activator-lib deleted (was c4544711)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch hotfix/ensure-origin-rpath-for-bnd-activator-lib in repository https://gitbox.apache.org/repos/asf/celix.git was c4544711 Remove unnecessary BUILD_RPATH setting. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[celix] branch master updated (8695bd78 -> 84ac9a4d)
This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git from 8695bd78 Merge pull request #606 from apache/hotfix/ensure-origin-rpath-for-bnd-activator-lib add eec29e2f [#607] make installed bundle use INSTALL_RPATH. add c4544711 Remove unnecessary BUILD_RPATH setting. new 84ac9a4d Merge pull request #608 from apache/hotfix/ensure-origin-rpath-for-bnd-activator-lib The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: cmake/cmake_celix/BundlePackaging.cmake | 322 ++-- 1 file changed, 186 insertions(+), 136 deletions(-)
[celix] 01/01: Merge pull request #608 from apache/hotfix/ensure-origin-rpath-for-bnd-activator-lib
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 84ac9a4dcaf09f4332d2dd705cbcb07435cb0c93 Merge: 8695bd78 c4544711 Author: PengZheng AuthorDate: Wed Aug 9 18:57:19 2023 +0800 Merge pull request #608 from apache/hotfix/ensure-origin-rpath-for-bnd-activator-lib hotfix/make installed bundle use INSTALL_RPATH. cmake/cmake_celix/BundlePackaging.cmake | 322 ++-- 1 file changed, 186 insertions(+), 136 deletions(-)
