#509: Remove conan options and test_package for removed bundles.

apache · Oct 8, 2023 · 1f09d40 · 1f09d40
1 parent 16c7dc4
commit 1f09d40
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 33 deletions.
diff --git a/bundles/shell/shell/CMakeLists.txt b/bundles/shell/shell/CMakeLists.txt
@@ -22,7 +22,6 @@ if (SHELL_API)
             $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/api>
             )
     target_link_libraries(shell_api INTERFACE Celix::utils)
-    target_include_directories(shell_api INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/deprecated_api>)
 
     install(TARGETS shell_api EXPORT celix COMPONENT shell
             INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/celix/shell)

diff --git a/conanfile.py b/conanfile.py
@@ -79,7 +79,6 @@ class CelixConan(ConanFile):
         "build_shell": False,
         "build_shell_api": False,
         "build_remote_shell": False,
-        "build_shell_bonjour": False,
         "build_shell_tui": False,
         "build_shell_wui": False,
         "build_components_ready_check": False,
@@ -126,9 +125,6 @@ def validate(self):
         if self.options.build_rsa_discovery_zeroconf and self.settings.os != "Linux":
             raise ConanInvalidConfiguration("Celix build_rsa_discovery_zeroconf is only supported for Linux")
 
-        if self.options.build_shell_bonjour and self.settings.os != "Linux":
-            raise ConanInvalidConfiguration("Celix build_shell_bonjour is only supported for Linux")
-
         try:
             val = int(self.options.celix_err_buffer_size)
             if val <= 0:
@@ -143,7 +139,6 @@ def package_id(self):
         del self.info.options.build_pubsub_examples
         del self.info.options.build_cxx_rsa_integration
         del self.info.options.build_examples
-        del self.info.options.build_shell_bonjour
         del self.info.options.enable_testing_dependency_manager_for_cxx11
         del self.info.options.enable_testing_for_cxx14
         del self.info.options.enable_cmake_warning_tests
@@ -174,7 +169,6 @@ def configure(self):
         if self.settings.os != "Linux":
             options["build_rsa_remote_service_admin_shm_v2"] = False
             options["build_rsa_discovery_zeroconf"] = False
-            options["build_shell_bonjour"] = False
 
         if options["enable_code_coverage"]:
             options["enable_testing"] = True
@@ -185,9 +179,6 @@ def configure(self):
             options["build_log_service"] = True
             options["build_syslog_writer"] = True
 
-        if options["build_shell_bonjour"]:
-            options["build_shell"] = True
-
         if options["build_cxx_rsa_integration"]:
             options["build_cxx_remote_service_admin"] = True
             options["build_pushstreams"] = True
@@ -351,8 +342,8 @@ def configure(self):
             self.options['gtest'].shared = True
             if self.options.enable_address_sanitizer:
                 self.options["cpputest"].with_leak_detection = False
-        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)):
+        if (self.options.build_rsa_discovery_common
+                or (self.options.build_rsa_remote_service_admin_dfi and self.options.enable_testing)):
             self.options['libxml2'].shared = True
         if self.options.build_pubsub_psa_zmq:
             self.options['zeromq'].shared = True
@@ -376,8 +367,8 @@ def requirements(self):
                 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_rsa_discovery_common or self.options.build_shell_bonjour or
-                (self.options.build_rsa_remote_service_admin_dfi and self.options.enable_testing)):
+        if (self.options.build_rsa_discovery_common
+                or (self.options.build_rsa_remote_service_admin_dfi and self.options.enable_testing)):
             self.requires("libxml2/[>=2.9.9 <3.0.0]")
         if self.options.build_cxx_remote_service_admin:
             self.requires("rapidjson/[>=1.1.0 <2.0.0]")
@@ -391,7 +382,7 @@ def requirements(self):
             self.requires("libffi/[>=3.2.1 <4.0.0]")
         if self.options.build_celix_dfi or self.options.build_celix_etcdlib:
             self.requires("jansson/[>=2.12 <3.0.0]")
-        if self.options.build_rsa_discovery_zeroconf or self.options.build_shell_bonjour:
+        if self.options.build_rsa_discovery_zeroconf:
             # TODO: To be replaced with mdnsresponder/1790.80.10, resolve some problems of mdnsresponder
             # https://github.com/conan-io/conan-center-index/pull/16254
             self.requires("mdnsresponder/1310.140.1")

diff --git a/examples/conan_test_package/CMakeLists.txt b/examples/conan_test_package/CMakeLists.txt
@@ -112,19 +112,6 @@ if (TEST_PSA_TCP)
             )
 endif ()
 
-option(TEST_PSA_UDP_MC "Test UDP MC PubSub Admin" OFF)
-if (TEST_PSA_UDP_MC)
-    add_celix_container(use_psa_udp_mc
-            BUNDLES
-            Celix::celix_pubsub_topology_manager
-            Celix::celix_pubsub_admin_udp_multicast
-            hello
-            PROPERTIES
-            PSA_UDPMC_VERBOSE=true
-            PUBSUB_TOPOLOGY_MANAGER_VERBOSE=true
-            )
-endif ()
-
 option(TEST_PSA_WS "Test WebSocket PubSub Admin" OFF)
 if (TEST_PSA_WS)
     add_celix_container(use_psa_ws
@@ -390,11 +377,6 @@ if (TEST_SHELL_API)
     target_link_libraries(use_shell_api PRIVATE Celix::shell_api)
 endif ()
 
-option(TEST_SHELL_BONJOUR "Test shell bonjour" OFF)
-if (TEST_SHELL_BONJOUR)
-    add_celix_container("use_shell_bonjour" INSTALL_BUNDLES Celix::bonjour_shell BUNDLES hello)
-endif ()
-
 option(TEST_CELIX_DFI "Test Celix DFI" OFF)
 if (TEST_CELIX_DFI)
     add_executable(use_celix_dfi test_celix_dfi.c)