This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/508-remove-deployment-admin-bundle
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to
refs/heads/feature/508-remove-deployment-admin-bundle by this push:
new 55078a9d #509: Remove deployment admin usage from conan test packages
55078a9d is described below
commit 55078a9d6961a6ef2fde844f5784e1908920c2ad
Author: Pepijn Noltes <[email protected]>
AuthorDate: Sun Oct 1 16:34:52 2023 +0200
#509: Remove deployment admin 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..8c41e12c 100644
--- a/examples/conan_test_package/conanfile.py
+++ b/examples/conan_test_package/conanfile.py
@@ -53,7 +53,6 @@ class TestPackageConan(ConanFile):
cmake.definitions["TEST_LAUNCHER"] =
self.options["celix"].build_launcher
cmake.definitions["TEST_PROMISES"] =
self.options["celix"].build_promises
cmake.definitions["TEST_PUSHSTREAMS"] =
self.options["celix"].build_pushstreams
- cmake.definitions["TEST_DEPLOYMENT_ADMIN"] =
self.options["celix"].build_deployment_admin
cmake.definitions["TEST_LOG_HELPER"] =
self.options["celix"].build_log_helper
cmake.definitions["TEST_LOG_SERVICE_API"] =
self.options["celix"].build_log_service_api
cmake.definitions["TEST_PUBSUB_WIRE_PROTOCOL_V1"] =
self.options["celix"].build_pubsub_wire_protocol_v1
@@ -132,9 +131,6 @@ class TestPackageConan(ConanFile):
self.run("./use_promises", run_environment=True)
if self.options["celix"].build_pushstreams:
self.run("./use_pushstreams", run_environment=True)
- if self.options["celix"].build_deployment_admin:
- self.run("./use_deployment_admin",
- cwd=os.path.join("deploy", "use_deployment_admin"),
run_environment=True)
if self.options["celix"].build_log_helper:
self.run("./use_log_helper", run_environment=True)
if self.options["celix"].build_log_service_api:
diff --git a/examples/conan_test_package_v2/conanfile.py
b/examples/conan_test_package_v2/conanfile.py
index cf2aca10..12b35200 100644
--- a/examples/conan_test_package_v2/conanfile.py
+++ b/examples/conan_test_package_v2/conanfile.py
@@ -63,7 +63,6 @@ class TestPackageConan(ConanFile):
tc.cache_variables["TEST_LAUNCHER"] = celix_options.build_launcher
tc.cache_variables["TEST_PROMISES"] = celix_options.build_promises
tc.cache_variables["TEST_PUSHSTREAMS"] =
celix_options.build_pushstreams
- tc.cache_variables["TEST_DEPLOYMENT_ADMIN"] =
celix_options.build_deployment_admin
tc.cache_variables["TEST_LOG_HELPER"] = celix_options.build_log_helper
tc.cache_variables["TEST_LOG_SERVICE_API"] =
celix_options.build_log_service_api
tc.cache_variables["TEST_PUBSUB_WIRE_PROTOCOL_V1"] =
celix_options.build_pubsub_wire_protocol_v1
@@ -148,9 +147,6 @@ class TestPackageConan(ConanFile):
self.run("./conan_test_package/use_promises",
env="conanrun")
if celix_options.build_pushstreams:
self.run("./conan_test_package/use_pushstreams",
env="conanrun")
- if celix_options.build_deployment_admin:
- self.run("./use_deployment_admin",
- cwd=os.path.join("deploy",
"use_deployment_admin"), env="conanrun")
if celix_options.build_log_helper:
self.run("./conan_test_package/use_log_helper",
env="conanrun")
if celix_options.build_log_service_api:
