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 15ff5a6d #509: Remove deployment admin feature from conanfile
15ff5a6d is described below
commit 15ff5a6ddc71cd529b5b24e8973517e895b34b0a
Author: Pepijn Noltes <[email protected]>
AuthorDate: Sun Oct 1 14:55:58 2023 +0200
#509: Remove deployment admin feature from conanfile
---
conanfile.py | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/conanfile.py b/conanfile.py
index dc145bbd..b2256098 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -50,7 +50,6 @@ class CelixConan(ConanFile):
"enable_testing_dependency_manager_for_cxx11": False,
"enable_testing_for_cxx14": False,
"build_all": False,
- "build_deployment_admin": False,
"build_http_admin": False,
"build_log_service": False,
"build_log_helper": False,
@@ -190,9 +189,6 @@ class CelixConan(ConanFile):
if options["build_shell_bonjour"]:
options["build_shell"] = True
- if options["build_deployment_admin"]:
- options["build_framework"] = True
-
if options["build_cxx_rsa_integration"]:
options["build_cxx_remote_service_admin"] = True
options["build_pushstreams"] = True
@@ -352,13 +348,11 @@ class CelixConan(ConanFile):
if self.options.build_framework or self.options.build_pubsub:
self.options['util-linux-libuuid'].shared = True
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_celix_etcdlib
or self.options.build_rsa_discovery_common or
self.options.build_rsa_remote_service_admin_dfi
or self.options.build_launcher):
self.options['libcurl'].shared = True
self.options['openssl'].shared = True
- if self.options.build_deployment_admin:
- self.options['zlib'].shared = True
if self.options.enable_testing:
self.options['gtest'].shared = True
if self.options.enable_address_sanitizer:
@@ -384,12 +378,10 @@ class CelixConan(ConanFile):
if self.options.build_framework or self.options.build_pubsub:
self.requires("util-linux-libuuid/2.39")
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_celix_etcdlib
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]")
- if self.options.build_deployment_admin:
- self.requires("zlib/[>=1.2.8 <2.0.0]")
if (self.options.build_rsa_discovery_common or
self.options.build_shell_bonjour or
(self.options.build_rsa_remote_service_admin_dfi and
self.options.enable_testing)):
self.requires("libxml2/[>=2.9.9 <3.0.0]")
