This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/509-remove-install-of-v2-headers
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to
refs/heads/feature/509-remove-install-of-v2-headers by this push:
new 3ad135bd #509: Remove bonjour shell usage from conan test packages
3ad135bd is described below
commit 3ad135bd0249400e71ca42810fc749200632f321
Author: Pepijn Noltes <[email protected]>
AuthorDate: Sun Oct 1 16:36:50 2023 +0200
#509: Remove bonjour shell usage from conan test packages
---
examples/conan_test_package/conanfile.py | 4 ----
examples/conan_test_package_v2/conanfile.py | 4 ----
2 files changed, 8 deletions(-)
diff --git a/examples/conan_test_package/conanfile.py
b/examples/conan_test_package/conanfile.py
index bb837577..15897288 100644
--- a/examples/conan_test_package/conanfile.py
+++ b/examples/conan_test_package/conanfile.py
@@ -62,7 +62,6 @@ class TestPackageConan(ConanFile):
cmake.definitions["TEST_PUBSUB_AVROBIN_SERIALIZER"] =
self.options["celix"].build_pubsub_avrobin_serializer
cmake.definitions["TEST_CXX_REMOTE_SERVICE_ADMIN"] =
self.options["celix"].build_cxx_remote_service_admin
cmake.definitions["TEST_SHELL_API"] =
self.options["celix"].build_shell_api
- cmake.definitions["TEST_SHELL_BONJOUR"] =
self.options["celix"].build_shell_bonjour
cmake.definitions["TEST_CELIX_DFI"] =
self.options["celix"].build_celix_dfi
cmake.definitions["TEST_UTILS"] = self.options["celix"].build_utils
cmake.definitions["TEST_COMPONENTS_READY_CHECK"] =
self.options["celix"].build_components_ready_check
@@ -157,9 +156,6 @@ class TestPackageConan(ConanFile):
self.run("./use_rsa_spi", run_environment=True)
if self.options["celix"].build_shell_api:
self.run("./use_shell_api", run_environment=True)
- if self.options["celix"].build_shell_bonjour:
- self.run("./use_shell_bonjour",
- cwd=os.path.join("deploy", "use_shell_bonjour"),
run_environment=True)
if self.options["celix"].build_celix_dfi:
self.run("./use_celix_dfi", run_environment=True)
if self.options["celix"].build_utils:
diff --git a/examples/conan_test_package_v2/conanfile.py
b/examples/conan_test_package_v2/conanfile.py
index cf2aca10..2ac45dd9 100644
--- a/examples/conan_test_package_v2/conanfile.py
+++ b/examples/conan_test_package_v2/conanfile.py
@@ -72,7 +72,6 @@ class TestPackageConan(ConanFile):
tc.cache_variables["TEST_PUBSUB_AVROBIN_SERIALIZER"] =
celix_options.build_pubsub_avrobin_serializer
tc.cache_variables["TEST_CXX_REMOTE_SERVICE_ADMIN"] =
celix_options.build_cxx_remote_service_admin
tc.cache_variables["TEST_SHELL_API"] = celix_options.build_shell_api
- tc.cache_variables["TEST_SHELL_BONJOUR"] =
celix_options.build_shell_bonjour
tc.cache_variables["TEST_CELIX_DFI"] = celix_options.build_celix_dfi
tc.cache_variables["TEST_UTILS"] = celix_options.build_utils
tc.cache_variables["TEST_COMPONENTS_READY_CHECK"] =
celix_options.build_components_ready_check
@@ -173,9 +172,6 @@ class TestPackageConan(ConanFile):
self.run("./conan_test_package/use_rsa_spi",
env="conanrun")
if celix_options.build_shell_api:
self.run("./conan_test_package/use_shell_api",
env="conanrun")
- if celix_options.build_shell_bonjour:
- self.run("./use_shell_bonjour",
- cwd=os.path.join("deploy", "use_shell_bonjour"),
env="conanrun")
if celix_options.build_celix_dfi:
self.run("./conan_test_package/use_celix_dfi",
env="conanrun")
if celix_options.build_utils:
