Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated header for public api #542

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Prev Previous commit
Revert "Add conan_test_package for rsa_discovery_zeroconf"
This reverts commit 1998e10.
xuzhenbao committed May 5, 2023
commit cdc77e072d498f732f42c2a9d06a8327b672e6f5
12 changes: 0 additions & 12 deletions examples/conan_test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -237,18 +237,6 @@ if (TEST_RSA_DISCOVERY_ETCD)
)
endif ()

option(TEST_RSA_DISCOVERY_ZEROCONF "Test the Discovery (ZEROCONF) bundle" OFF)
if (TEST_RSA_DISCOVERY_ZEROCONF)
add_celix_container(use_rsa_discovery_zeroconf
BUNDLES
Celix::rsa_discovery_zeroconf
Celix::rsa_topology_manager
my_rsa
hello
PROPERTIES
)
endif ()

option(TEST_SHELL "Test shell" OFF)
if (TEST_SHELL)
add_executable(use_shell test_shell.c)
3 changes: 0 additions & 3 deletions examples/conan_test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -40,7 +40,6 @@ def build(self):
cmake.definitions["TEST_RSA_RPC_JSON"] = self.options["celix"].build_rsa_json_rpc
cmake.definitions["TEST_RSA_DISCOVERY_CONFIGURED"] = self.options["celix"].build_rsa_discovery_configured
cmake.definitions["TEST_RSA_DISCOVERY_ETCD"] = self.options["celix"].build_rsa_discovery_etcd
cmake.definitions["TEST_RSA_DISCOVERY_ZEROCONF"] = self.options["celix"].build_rsa_discovery_zeroconf
cmake.definitions["TEST_SHELL"] = self.options["celix"].build_shell
if self.options["celix"].build_shell:
cmake.definitions["TEST_CXX_SHELL"] = self.options["celix"].celix_cxx17 or self.options["celix"].celix_cxx14
@@ -94,8 +93,6 @@ def test(self):
self.run("./use_rsa_configured", cwd=os.path.join("deploy", "use_rsa_configured"), run_environment=True)
if self.options["celix"].build_rsa_discovery_etcd:
self.run("./use_rsa_etcd", cwd=os.path.join("deploy", "use_rsa_etcd"), run_environment=True)
if self.options["celix"].build_rsa_discovery_zeroconf:
self.run("./use_rsa_discovery_zeroconf", cwd=os.path.join("deploy", "use_rsa_discovery_zeroconf"), run_environment=True)
if self.options["celix"].build_shell:
self.run("./use_shell", run_environment=True)
if self.options["celix"].celix_cxx17 or self.options["celix"].celix_cxx14: