This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/pubsub-interceptor-fix in repository https://gitbox.apache.org/repos/asf/celix.git
commit 02a962787f3291e9858bd37c5501ae97e8f14bef Author: Pepijn Noltes <[email protected]> AuthorDate: Mon Jul 26 16:25:31 2021 +0200 Updates cmake configuration and fixes invalid pubsub cmake aliases. --- bundles/cxx_remote_services/CMakeLists.txt | 3 +- .../discovery_configured/CMakeLists.txt | 1 + .../cxx_remote_services/integration/CMakeLists.txt | 20 +- .../integration/gtest/CMakeLists.txt | 16 +- bundles/http_admin/http_admin/CMakeLists.txt | 1 + bundles/logging/log_admin/CMakeLists.txt | 1 + bundles/logging/log_service_v2/CMakeLists.txt | 2 + .../log_writers/syslog_writer/CMakeLists.txt | 1 + bundles/pubsub/CMakeLists.txt | 12 +- bundles/pubsub/examples/CMakeLists.txt | 156 ++++++++-------- bundles/pubsub/integration/CMakeLists.txt | 202 ++++++++++----------- bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt | 4 +- bundles/pubsub/pubsub_admin_tcp/v2/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 2 +- .../pubsub_admin_websocket/v1/CMakeLists.txt | 4 +- .../pubsub_admin_websocket/v2/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_admin_zmq/v2/CMakeLists.txt | 2 +- bundles/pubsub/pubsub_discovery/CMakeLists.txt | 2 +- .../pubsub_protocol_wire_v1/CMakeLists.txt | 2 +- .../pubsub_protocol_wire_v2/CMakeLists.txt | 2 +- .../pubsub_serializer_avrobin/CMakeLists.txt | 2 +- .../pubsub/pubsub_serializer_json/CMakeLists.txt | 2 +- .../pubsub/pubsub_topology_manager/CMakeLists.txt | 2 +- bundles/shell/remote_shell/CMakeLists.txt | 1 + bundles/shell/shell/CMakeLists.txt | 2 + bundles/shell/shell_bonjour/CMakeLists.txt | 1 + bundles/shell/shell_tui/CMakeLists.txt | 1 + bundles/shell/shell_wui/CMakeLists.txt | 1 + cmake/AddGTest.cmake | 2 +- cmake/CelixConfig.cmake | 11 ++ cmake/cmake_celix/BundlePackaging.cmake | 109 ++++++----- cmake/cmake_celix/Generic.cmake | 13 +- documents/cmake_commands/README.md | 28 +++ 34 files changed, 330 insertions(+), 284 deletions(-) diff --git a/bundles/cxx_remote_services/CMakeLists.txt b/bundles/cxx_remote_services/CMakeLists.txt index f09ae80..ac98684 100644 --- a/bundles/cxx_remote_services/CMakeLists.txt +++ b/bundles/cxx_remote_services/CMakeLists.txt @@ -17,7 +17,8 @@ celix_subproject(REMOTE_SERVICE_ADMIN "Option to enable building the C++17 Remote Service Admin Service bundles" OFF) if (REMOTE_SERVICE_ADMIN) - message(WARNING "The C++ Remote Service Admin is still experimental; The API, SPI and implementation is not stable and will change") + message(STATUS "The C++ Remote Service Admin is still experimental; The API, SPI and implementation is not stable and will change") + add_subdirectory(rsa_spi) add_subdirectory(admin) add_subdirectory(discovery_configured) diff --git a/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt b/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt index 39850ef..49f31dd 100644 --- a/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt +++ b/bundles/cxx_remote_services/discovery_configured/CMakeLists.txt @@ -28,6 +28,7 @@ add_celix_bundle(RsaConfiguredDiscovery VERSION 0.9.0 SYMBOLIC_NAME "apache::celix::RsaConfiguredDiscovery" NAME "Apache Celix Async Configured Discovery" + FILENAME celix_RsaConfiguredDiscovery GROUP "Celix/RSA" SOURCES src/ConfiguredDiscoveryManager.cc diff --git a/bundles/cxx_remote_services/integration/CMakeLists.txt b/bundles/cxx_remote_services/integration/CMakeLists.txt index 4b578ce..860a081 100644 --- a/bundles/cxx_remote_services/integration/CMakeLists.txt +++ b/bundles/cxx_remote_services/integration/CMakeLists.txt @@ -58,11 +58,11 @@ add_celix_container(RemoteCalculatorProvider Celix::shell_tui #Pubsub needed for remote services on pubsub - Celix::pubsub_serializer_json - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq_v2 - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_discovery_etcd + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq_v2 + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_discovery_etcd #Remote Services Celix::RemoteServiceAdmin @@ -81,11 +81,11 @@ add_celix_container(RemoteCalculatorConsumer Celix::shell_tui #Pubsub needed for remote services on pubsub - Celix::pubsub_serializer_json - Celix::pubsub_topology_manager - Celix::pubsub_discovery_etcd - Celix::pubsub_admin_zmq_v2 - Celix::pubsub_protocol_wire_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_admin_zmq_v2 + Celix::celix_pubsub_protocol_wire_v2 #Remote Services Celix::RsaConfiguredDiscovery diff --git a/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt b/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt index 5c548ec..81386b9 100644 --- a/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt +++ b/bundles/cxx_remote_services/integration/gtest/CMakeLists.txt @@ -23,10 +23,10 @@ target_compile_options(test_cxx_remote_services_integration PRIVATE -std=c++17) target_include_directories(test_cxx_remote_services_integration PRIVATE ../include) #Add ICalculator add_celix_bundle_dependencies(test_cxx_remote_services_integration - Celix::pubsub_serializer_json - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq_v2 - Celix::pubsub_protocol_wire_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq_v2 + Celix::celix_pubsub_protocol_wire_v2 Celix::RsaConfiguredDiscovery Celix::RemoteServiceAdmin TestExportImportRemoteServiceFactory @@ -34,16 +34,16 @@ add_celix_bundle_dependencies(test_cxx_remote_services_integration CalculatorConsumer ) -celix_get_bundle_file(Celix::pubsub_serializer_json PS_SER_BUNDLE_LOC) +celix_get_bundle_file(Celix::celix_pubsub_serializer_json PS_SER_BUNDLE_LOC) target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_SER_BUNDLE_LOC="${PS_SER_BUNDLE_LOC}") -celix_get_bundle_file(Celix::pubsub_topology_manager PS_PSTM_BUNDLE_LOC) +celix_get_bundle_file(Celix::celix_pubsub_topology_manager PS_PSTM_BUNDLE_LOC) target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_PSTM_BUNDLE_LOC="${PS_PSTM_BUNDLE_LOC}") -celix_get_bundle_file(Celix::pubsub_admin_zmq_v2 PS_PSA_BUNDLE_LOC) +celix_get_bundle_file(Celix::celix_pubsub_admin_zmq_v2 PS_PSA_BUNDLE_LOC) target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_PSA_BUNDLE_LOC="${PS_PSA_BUNDLE_LOC}") -celix_get_bundle_file(Celix::pubsub_protocol_wire_v2 PS_WIRE_BUNDLE_LOC) +celix_get_bundle_file(Celix::celix_pubsub_protocol_wire_v2 PS_WIRE_BUNDLE_LOC) target_compile_definitions(test_cxx_remote_services_integration PRIVATE PS_WIRE_BUNDLE_LOC="${PS_WIRE_BUNDLE_LOC}") celix_get_bundle_file(Celix::RsaConfiguredDiscovery RS_DISCOVERY_BUNDLE_LOC) diff --git a/bundles/http_admin/http_admin/CMakeLists.txt b/bundles/http_admin/http_admin/CMakeLists.txt index 6a24137..7153b61 100644 --- a/bundles/http_admin/http_admin/CMakeLists.txt +++ b/bundles/http_admin/http_admin/CMakeLists.txt @@ -25,6 +25,7 @@ add_celix_bundle(http_admin SYMBOLIC_NAME "apache_celix_http_admin" GROUP "Celix/HTTP_admin" NAME "Apache Celix HTTP Admin" + FILENAME celix_http_admin ) target_include_directories(http_admin PRIVATE src) diff --git a/bundles/logging/log_admin/CMakeLists.txt b/bundles/logging/log_admin/CMakeLists.txt index 828f78d..3d2bdff 100644 --- a/bundles/logging/log_admin/CMakeLists.txt +++ b/bundles/logging/log_admin/CMakeLists.txt @@ -23,6 +23,7 @@ add_celix_bundle(log_admin SOURCES src/celix_log_admin.c src/celix_log_admin_activator.c + FILENAME celix_log_admin ) target_link_libraries(log_admin PRIVATE Celix::log_helper Celix::shell_api) target_include_directories(log_admin PRIVATE src) diff --git a/bundles/logging/log_service_v2/CMakeLists.txt b/bundles/logging/log_service_v2/CMakeLists.txt index 796269e..ecefd3e 100644 --- a/bundles/logging/log_service_v2/CMakeLists.txt +++ b/bundles/logging/log_service_v2/CMakeLists.txt @@ -18,6 +18,7 @@ add_celix_bundle(log_service SYMBOLIC_NAME "apache_celix_log_service" NAME "Apache Celix Log Service" + FILENAME celix_log_service GROUP "Celix/Logging" VERSION "1.1.0" SOURCES @@ -36,6 +37,7 @@ install_celix_bundle(log_service EXPORT celix COMPONENT logging) add_celix_bundle(log_writer_stdout SYMBOLIC_NAME "apache_celix_log_writer_stdout" NAME "Apache Celix Log Writer Stdout" + FILENAME celix_log_writer_stdout GROUP "Celix/Logging" VERSION "1.1.0" SOURCES diff --git a/bundles/logging/log_writers/syslog_writer/CMakeLists.txt b/bundles/logging/log_writers/syslog_writer/CMakeLists.txt index 428b286..e0678dd 100644 --- a/bundles/logging/log_writers/syslog_writer/CMakeLists.txt +++ b/bundles/logging/log_writers/syslog_writer/CMakeLists.txt @@ -18,6 +18,7 @@ add_celix_bundle(syslog_writer SYMBOLIC_NAME "apache_celix_syslog_writer" NAME "Apache Celix Syslog Writer" + FILENAME celix_syslog_writer GROUP "Celix/Logging" VERSION "1.0.0" SOURCES diff --git a/bundles/pubsub/CMakeLists.txt b/bundles/pubsub/CMakeLists.txt index 482ee3a..01d2140 100644 --- a/bundles/pubsub/CMakeLists.txt +++ b/bundles/pubsub/CMakeLists.txt @@ -21,16 +21,16 @@ if (PUBSUB) option(BUILD_PUBSUB_PSA_ZMQ "Build ZeroMQ PubSub Admin (LGPL License)" ON) if (BUILD_PUBSUB_PSA_ZMQ) option(BUILD_ZMQ_SECURITY "Build with security for ZeroMQ." OFF) - add_subdirectory(pubsub_admin_zmq/v1) #TODO option for v1 admins + add_subdirectory(pubsub_admin_zmq/v1) add_subdirectory(pubsub_admin_zmq/v2) - add_library(Celix::pubsub_admin_zmq ALIAS celix_pubsub_admin_zmq_v1) #TODO move to config and set to v2 + add_library(Celix::celix_pubsub_admin_zmq ALIAS celix_pubsub_admin_zmq_v1) endif (BUILD_PUBSUB_PSA_ZMQ) option(BUILD_PUBSUB_PSA_TCP "Build TCP PubSub Admin" ON) if (BUILD_PUBSUB_PSA_TCP) - add_subdirectory(pubsub_admin_tcp/v1) #TODO option for v1 admins + add_subdirectory(pubsub_admin_tcp/v1) add_subdirectory(pubsub_admin_tcp/v2) - add_library(Celix::pubsub_admin_tcp ALIAS celix_pubsub_admin_tcp_v1) #TODO move to config and set to v2 + add_library(Celix::celix_pubsub_admin_tcp ALIAS celix_pubsub_admin_tcp_v1) endif (BUILD_PUBSUB_PSA_TCP) option(BUILD_PUBSUB_PSA_UDP_MC "Build UDP MC PubSub Admin" ON) @@ -40,9 +40,9 @@ if (PUBSUB) option(BUILD_PUBSUB_PSA_WS "Build WebSocket PubSub Admin" ON) if (BUILD_PUBSUB_PSA_WS) - add_subdirectory(pubsub_admin_websocket/v1) #TODO option for v1 admins + add_subdirectory(pubsub_admin_websocket/v1) add_subdirectory(pubsub_admin_websocket/v2) - add_library(Celix::pubsub_admin_websocket ALIAS celix_pubsub_admin_websocket_v1) #TODO move to config and set to v2 + add_library(Celix::celix_pubsub_admin_websocket ALIAS celix_pubsub_admin_websocket_v1) endif (BUILD_PUBSUB_PSA_WS) add_subdirectory(pubsub_api) diff --git a/bundles/pubsub/examples/CMakeLists.txt b/bundles/pubsub/examples/CMakeLists.txt index b81c797..a34a28b 100644 --- a/bundles/pubsub/examples/CMakeLists.txt +++ b/bundles/pubsub/examples/CMakeLists.txt @@ -32,10 +32,10 @@ if (BUILD_PUBSUB_PSA_UDP_MC) Celix::log_admin Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_udp_multicast + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_udp_multicast celix_pubsub_poi_publisher celix_pubsub_poi_publisher2 PROPERTIES @@ -51,10 +51,10 @@ if (BUILD_PUBSUB_PSA_UDP_MC) Celix::log_admin Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_udp_multicast + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_udp_multicast celix_pubsub_poi_subscriber PROPERTIES PSA_UDPMC_VERBOSE=true @@ -69,10 +69,10 @@ if (BUILD_PUBSUB_PSA_UDP_MC) Celix::log_admin Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_udp_multicast + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_udp_multicast celix_pubsub_poi_subscriber PROPERTIES PSA_UDPMC_VERBOSE=true @@ -105,11 +105,11 @@ if (BUILD_PUBSUB_PSA_TCP) Celix::log_admin Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp - Celix::pubsub_protocol_wire_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp + Celix::celix_pubsub_protocol_wire_v2 celix_pubsub_poi_publisher celix_pubsub_poi_publisher2 PROPERTIES @@ -125,11 +125,11 @@ if (BUILD_PUBSUB_PSA_TCP) Celix::log_admin Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp - Celix::pubsub_protocol_wire_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp + Celix::celix_pubsub_protocol_wire_v2 celix_pubsub_poi_subscriber PROPERTIES PSA_TCP_VERBOSE=true @@ -144,11 +144,11 @@ if (BUILD_PUBSUB_PSA_TCP) Celix::log_admin Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp - Celix::pubsub_protocol_wire_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp + Celix::celix_pubsub_protocol_wire_v2 celix_pubsub_poi_subscriber PROPERTIES PSA_TCP_VERBOSE=true @@ -186,13 +186,13 @@ if (BUILD_PUBSUB_PSA_ZMQ) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq - Celix::pubsub_admin_udp_multicast - Celix::pubsub_admin_tcp - Celix::pubsub_protocol_wire_v1 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq + Celix::celix_pubsub_admin_udp_multicast + Celix::celix_pubsub_admin_tcp + Celix::celix_pubsub_protocol_wire_v1 celix_pubsub_poi_publisher celix_pubsub_poi_publisher2 ) @@ -203,13 +203,13 @@ if (BUILD_PUBSUB_PSA_ZMQ) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq - Celix::pubsub_admin_udp_multicast - Celix::pubsub_admin_tcp - Celix::pubsub_protocol_wire_v1 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq + Celix::celix_pubsub_admin_udp_multicast + Celix::celix_pubsub_admin_tcp + Celix::celix_pubsub_protocol_wire_v1 celix_pubsub_poi_subscriber ) target_link_libraries(pubsub_subscriber PRIVATE ${PUBSUB_CONTAINER_LIBS}) @@ -221,10 +221,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq celix_pubsub_poi_publisher celix_pubsub_poi_subscriber PROPERTIES @@ -237,11 +237,11 @@ if (BUILD_PUBSUB_PSA_ZMQ) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v1 - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v1 + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq celix_pubsub_poi_publisher celix_pubsub_poi_publisher2 celix_pubsub_interceptors_example @@ -258,11 +258,11 @@ if (BUILD_PUBSUB_PSA_ZMQ) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v1 - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v1 + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq celix_pubsub_poi_subscriber celix_pubsub_interceptors_example PROPERTIES @@ -277,10 +277,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq celix_pubsub_poi_subscriber PROPERTIES PSA_ZMQ_VERBOSE=true @@ -326,10 +326,10 @@ if (BUILD_PUBSUB_PSA_NANOMSG) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_nanomsg + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_nanomsg celix_pubsub_poi_publisher PROPERTIES PSA_NANOMSG_VERBOSE=true @@ -343,10 +343,10 @@ if (BUILD_PUBSUB_PSA_NANOMSG) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_nanomsg + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_nanomsg celix_pubsub_poi_publisher PROPERTIES PSA_NANOMSG_VERBOSE=true @@ -360,10 +360,10 @@ if (BUILD_PUBSUB_PSA_NANOMSG) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_nanomsg + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_nanomsg celix_pubsub_poi_subscriber PROPERTIES PSA_NANOMSG_VERBOSE=true @@ -377,10 +377,10 @@ if (BUILD_PUBSUB_PSA_NANOMSG) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_discovery_etcd - Celix::pubsub_topology_manager - Celix::pubsub_admin_nanomsg + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_discovery_etcd + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_nanomsg celix_pubsub_poi_subscriber PROPERTIES PSA_NANOMSG_VERBOSE=true @@ -415,9 +415,9 @@ if (BUILD_PUBSUB_PSA_WS) Celix::shell Celix::shell_tui Celix::http_admin - Celix::pubsub_serializer_json - Celix::pubsub_topology_manager - Celix::pubsub_admin_websocket + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_websocket celix_pubsub_websocket_example PROPERTIES PSA_TCP_VERBOSE=true diff --git a/bundles/pubsub/integration/CMakeLists.txt b/bundles/pubsub/integration/CMakeLists.txt index 9c9ce54..8f21fda 100644 --- a/bundles/pubsub/integration/CMakeLists.txt +++ b/bundles/pubsub/integration/CMakeLists.txt @@ -145,9 +145,9 @@ if (BUILD_PUBSUB_PSA_UDP_MC) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_topology_manager - Celix::pubsub_admin_udp_multicast + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_udp_multicast pubsub_sut pubsub_tst ) @@ -162,10 +162,10 @@ if (BUILD_PUBSUB_PSA_UDP_MC) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_udp_multicast + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_udp_multicast Celix::shell Celix::shell_tui ) @@ -199,10 +199,10 @@ if (BUILD_PUBSUB_PSA_TCP) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v1 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v1 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp pubsub_sut pubsub_tst ) @@ -221,10 +221,10 @@ if (BUILD_PUBSUB_PSA_TCP) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp pubsub_sut pubsub_tst ) @@ -244,10 +244,10 @@ if (BUILD_PUBSUB_PSA_TCP) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp pubsub_sut pubsub_tst ) @@ -266,10 +266,10 @@ if (BUILD_PUBSUB_PSA_TCP) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp pubsub_endpoint_tst pubsub_endpoint_sut pubsub_loopback @@ -285,10 +285,10 @@ if (BUILD_PUBSUB_PSA_TCP) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp Celix::shell Celix::shell_tui ) @@ -324,10 +324,10 @@ if (BUILD_PUBSUB_PSA_TCP) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v1 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v1 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp_v2 pubsub_sut pubsub_tst pubsub_serializer @@ -347,10 +347,10 @@ if (BUILD_PUBSUB_PSA_TCP) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp_v2 pubsub_sut pubsub_tst pubsub_serializer @@ -371,10 +371,10 @@ if (BUILD_PUBSUB_PSA_TCP) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp_v2 pubsub_sut pubsub_tst pubsub_serializer @@ -394,10 +394,10 @@ if (BUILD_PUBSUB_PSA_TCP) BUNDLES Celix::shell Celix::shell_tui - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp_v2 pubsub_endpoint_tst pubsub_endpoint_sut pubsub_loopback @@ -414,10 +414,10 @@ if (BUILD_PUBSUB_PSA_TCP) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_tcp_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_tcp_v2 Celix::shell Celix::shell_tui pubsub_serializer @@ -454,10 +454,10 @@ if (BUILD_PUBSUB_PSA_WS) USE_WEBSOCKETS=true LISTENING_PORTS=8080 BUNDLES - Celix::pubsub_serializer_json + Celix::celix_pubsub_serializer_json Celix::http_admin - Celix::pubsub_topology_manager - Celix::pubsub_admin_websocket + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_websocket pubsub_sut pubsub_tst ) @@ -474,10 +474,10 @@ if (BUILD_PUBSUB_PSA_WS) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_websocket + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_websocket Celix::shell Celix::shell_tui ) @@ -505,10 +505,10 @@ if (BUILD_PUBSUB_PSA_WS) USE_WEBSOCKETS=true LISTENING_PORTS=8080 BUNDLES - Celix::pubsub_serializer_json + Celix::celix_pubsub_serializer_json Celix::http_admin - Celix::pubsub_topology_manager - Celix::pubsub_admin_websocket_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_websocket_v2 pubsub_sut pubsub_tst pubsub_serializer @@ -526,9 +526,9 @@ if (BUILD_PUBSUB_PSA_WS) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_topology_manager - Celix::pubsub_admin_websocket_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_websocket_v2 Celix::shell Celix::shell_tui pubsub_serializer @@ -560,10 +560,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v1 - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v1 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq pubsub_sut pubsub_tst pubsub_serializer @@ -577,10 +577,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq_v2 - Celix::pubsub_protocol_wire_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq_v2 + Celix::celix_pubsub_protocol_wire_v2 pubsub_sut pubsub_tst pubsub_serializer @@ -604,10 +604,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq pubsub_sut pubsub_tst pubsub_serializer @@ -628,10 +628,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) PSA_ZMQ_ZEROCOPY_ENABLED=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v1 - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v1 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq Celix::shell Celix::shell_tui pubsub_sut @@ -648,10 +648,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) PSA_ZMQ_ZEROCOPY_ENABLED=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq_v2 - Celix::pubsub_protocol_wire_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq_v2 + Celix::celix_pubsub_protocol_wire_v2 Celix::shell Celix::shell_tui pubsub_sut @@ -679,10 +679,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) PSA_ZMQ_ZEROCOPY_ENABLED=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq Celix::shell Celix::shell_tui pubsub_sut @@ -703,10 +703,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_protocol_wire_v2 - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_protocol_wire_v2 + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq Celix::shell Celix::shell_tui ) @@ -720,10 +720,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace BUNDLES - Celix::pubsub_serializer_json - Celix::pubsub_topology_manager - Celix::pubsub_admin_zmq_v2 - Celix::pubsub_protocol_wire_v2 + Celix::celix_pubsub_serializer_json + Celix::celix_pubsub_topology_manager + Celix::celix_pubsub_admin_zmq_v2 + Celix::celix_pubsub_protocol_wire_v2 ) target_compile_definitions(pstm_deadlock_zmq_test PRIVATE -DDEADLOCK_SUT_BUNDLE_FILE=\"${DEADLOCK_SUT_BUNDLE_FILE}\") target_link_libraries(pstm_deadlock_zmq_test PRIVATE Celix::pubsub_api GTest::gtest GTest::gtest_main Celix::dfi ZMQ::lib CZMQ::lib) @@ -763,10 +763,10 @@ if (BUILD_PUBSUB_PSA_ZMQ) setup_target_for_coverage(test_pubsub_topic_and_scope_integration SCAN_DIR ..) #configure topology manager and pubsub zmq, json serializer and wire protocol v2 bundles - celix_get_bundle_file(Celix::pubsub_serializer_json PUBSUB_JSON_BUNDLE_FILE) - celix_get_bundle_file(Celix::pubsub_topology_manager PUBSUB_TOPMAN_BUNDLE_FILE) - celix_get_bundle_file(Celix::pubsub_admin_zmq_v2 PUBSUB_ZMQ_BUNDLE_FILE) - celix_get_bundle_file(Celix::pubsub_protocol_wire_v2 PUBSUB_WIRE_BUNDLE_FILE) + celix_get_bundle_file(Celix::celix_pubsub_serializer_json PUBSUB_JSON_BUNDLE_FILE) + celix_get_bundle_file(Celix::celix_pubsub_topology_manager PUBSUB_TOPMAN_BUNDLE_FILE) + celix_get_bundle_file(Celix::celix_pubsub_admin_zmq_v2 PUBSUB_ZMQ_BUNDLE_FILE) + celix_get_bundle_file(Celix::celix_pubsub_protocol_wire_v2 PUBSUB_WIRE_BUNDLE_FILE) add_dependencies(test_pubsub_topic_and_scope_integration celix_pubsub_serializer_json_bundle celix_pubsub_topology_manager_bundle @@ -791,13 +791,13 @@ if (BUILD_PUBSUB_PSA_ZMQ) setup_target_for_coverage(test_pubsub_interceptors_integration SCAN_DIR ..) #configure topology manager and pubsub zmq, json serializer and wire protocol v2 bundles - celix_get_bundle_file(Celix::pubsub_serializer_json PUBSUB_JSON_BUNDLE_FILE) - celix_get_bundle_file(Celix::pubsub_topology_manager PUBSUB_TOPMAN_BUNDLE_FILE) - celix_get_bundle_file(Celix::pubsub_admin_zmq_v2 PUBSUB_ZMQ_BUNDLE_FILE) - celix_get_bundle_file(Celix::pubsub_protocol_wire_v1 PUBSUB_WIRE_BUNDLE_FILE) + celix_get_bundle_file(Celix::celix_pubsub_serializer_json PUBSUB_JSON_BUNDLE_FILE) + celix_get_bundle_file(Celix::celix_pubsub_topology_manager PUBSUB_TOPMAN_BUNDLE_FILE) + celix_get_bundle_file(Celix::celix_pubsub_admin_zmq_v2 PUBSUB_ZMQ_BUNDLE_FILE) + celix_get_bundle_file(Celix::celix_pubsub_protocol_wire_v1 PUBSUB_WIRE_BUNDLE_FILE) celix_get_bundle_file(pubsub_sut PUBSUB_PUBLISHER_BUNDLE_FILE) celix_get_bundle_file(pubsub_tst PUBSUB_SUBSCRIBER_BUNDLE_FILE) - add_celix_bundle_dependencies(test_pubsub_interceptors_integration Celix::pubsub_serializer_json Celix::pubsub_topology_manager Celix::pubsub_admin_zmq_v2 Celix::pubsub_protocol_wire_v1 pubsub_sut pubsub_tst) + add_celix_bundle_dependencies(test_pubsub_interceptors_integration Celix::celix_pubsub_serializer_json Celix::celix_pubsub_topology_manager Celix::celix_pubsub_admin_zmq_v2 Celix::celix_pubsub_protocol_wire_v1 pubsub_sut pubsub_tst) target_compile_definitions(test_pubsub_interceptors_integration PRIVATE PUBSUB_JSON_BUNDLE_FILE="${PUBSUB_JSON_BUNDLE_FILE}" PUBSUB_TOPMAN_BUNDLE_FILE="${PUBSUB_TOPMAN_BUNDLE_FILE}" diff --git a/bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt b/bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt index 2f1bca8..8039b77 100644 --- a/bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_tcp/v1/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -message(WARNING "PubSub TCP Admin V1 is deprecated, use PubSub TCP Websocket v2 instead") +message(STATUS "PubSub TCP Admin V1 is deprecated, and will eventually be replaced with PubSub TCP Admin v2") find_package(UUID REQUIRED) @@ -43,4 +43,4 @@ endif() install_celix_bundle(celix_pubsub_admin_tcp_v1 EXPORT celix COMPONENT pubsub) target_link_libraries(celix_pubsub_admin_tcp_v1 PRIVATE Celix::shell_api) -add_library(Celix::pubsub_admin_tcp_v1 ALIAS celix_pubsub_admin_tcp_v1) +add_library(Celix::celix_pubsub_admin_tcp_v1 ALIAS celix_pubsub_admin_tcp_v1) diff --git a/bundles/pubsub/pubsub_admin_tcp/v2/CMakeLists.txt b/bundles/pubsub/pubsub_admin_tcp/v2/CMakeLists.txt index 117e85a..fce1a42 100644 --- a/bundles/pubsub/pubsub_admin_tcp/v2/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_tcp/v2/CMakeLists.txt @@ -41,4 +41,4 @@ endif() install_celix_bundle(celix_pubsub_admin_tcp_v2 EXPORT celix COMPONENT pubsub) target_link_libraries(celix_pubsub_admin_tcp_v2 PRIVATE Celix::shell_api) -add_library(Celix::pubsub_admin_tcp_v2 ALIAS celix_pubsub_admin_tcp_v2) +add_library(Celix::celix_pubsub_admin_tcp_v2 ALIAS celix_pubsub_admin_tcp_v2) diff --git a/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt b/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt index 910c7dd..4cf8fef 100644 --- a/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt @@ -37,6 +37,6 @@ target_link_libraries(celix_pubsub_admin_udp_multicast PRIVATE Celix::framework target_link_libraries(celix_pubsub_admin_udp_multicast PRIVATE Celix::pubsub_spi Celix::pubsub_utils ) install_celix_bundle(celix_pubsub_admin_udp_multicast EXPORT celix COMPONENT pubsub) -add_library(Celix::pubsub_admin_udp_multicast ALIAS celix_pubsub_admin_udp_multicast) +add_library(Celix::celix_pubsub_admin_udp_multicast ALIAS celix_pubsub_admin_udp_multicast) diff --git a/bundles/pubsub/pubsub_admin_websocket/v1/CMakeLists.txt b/bundles/pubsub/pubsub_admin_websocket/v1/CMakeLists.txt index 021310f..4cff18f 100644 --- a/bundles/pubsub/pubsub_admin_websocket/v1/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_websocket/v1/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -message(WARNING "PubSub Websocket Admin V1 is deprecated, use PubSub ZMQ Websocket v2 instead") +message(STATUS "PubSub Websocket Admin V1 is deprecated, and will eventually be replaced with PubSub Websocket Admin v2") find_package(Jansson REQUIRED) find_package(UUID REQUIRED) @@ -44,4 +44,4 @@ target_include_directories(celix_pubsub_admin_websocket_v1 PRIVATE install_celix_bundle(celix_pubsub_admin_websocket_v1 EXPORT celix COMPONENT pubsub) target_link_libraries(celix_pubsub_admin_websocket_v1 PRIVATE Celix::shell_api) -add_library(Celix::pubsub_admin_websocket_v1 ALIAS celix_pubsub_admin_websocket_v1) +add_library(Celix::celix_pubsub_admin_websocket_v1 ALIAS celix_pubsub_admin_websocket_v1) diff --git a/bundles/pubsub/pubsub_admin_websocket/v2/CMakeLists.txt b/bundles/pubsub/pubsub_admin_websocket/v2/CMakeLists.txt index 6557ddb..966adc1 100644 --- a/bundles/pubsub/pubsub_admin_websocket/v2/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_websocket/v2/CMakeLists.txt @@ -42,4 +42,4 @@ target_include_directories(celix_pubsub_admin_websocket_v2 PRIVATE install_celix_bundle(celix_pubsub_admin_websocket_v2 EXPORT celix COMPONENT pubsub) target_link_libraries(celix_pubsub_admin_websocket_v2 PRIVATE Celix::shell_api) -add_library(Celix::pubsub_admin_websocket_v2 ALIAS celix_pubsub_admin_websocket_v2) +add_library(Celix::celix_pubsub_admin_websocket_v2 ALIAS celix_pubsub_admin_websocket_v2) diff --git a/bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt b/bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt index bfd8eef..37ea629 100644 --- a/bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_zmq/v1/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -message(WARNING "PubSub ZMQ Admin V1 is deprecated, use PubSub ZMQ Admin v2 instead") +message(STATUS "PubSub ZMQ Admin V1 is deprecated, and will eventually be replaced with PubSub ZMQ Admin v2") find_package(ZMQ REQUIRED) find_package(CZMQ REQUIRED) diff --git a/bundles/pubsub/pubsub_admin_zmq/v2/CMakeLists.txt b/bundles/pubsub/pubsub_admin_zmq/v2/CMakeLists.txt index 02340a6..b227df7 100644 --- a/bundles/pubsub/pubsub_admin_zmq/v2/CMakeLists.txt +++ b/bundles/pubsub/pubsub_admin_zmq/v2/CMakeLists.txt @@ -55,4 +55,4 @@ target_include_directories(celix_pubsub_admin_zmq_v2 PRIVATE install_celix_bundle(celix_pubsub_admin_zmq_v2 EXPORT celix COMPONENT pubsub) target_link_libraries(celix_pubsub_admin_zmq_v2 PRIVATE Celix::shell_api) -add_library(Celix::pubsub_admin_zmq_v2 ALIAS celix_pubsub_admin_zmq_v2) +add_library(Celix::celix_pubsub_admin_zmq_v2 ALIAS celix_pubsub_admin_zmq_v2) diff --git a/bundles/pubsub/pubsub_discovery/CMakeLists.txt b/bundles/pubsub/pubsub_discovery/CMakeLists.txt index 73235e6..8dab81c 100644 --- a/bundles/pubsub/pubsub_discovery/CMakeLists.txt +++ b/bundles/pubsub/pubsub_discovery/CMakeLists.txt @@ -36,4 +36,4 @@ target_link_libraries(celix_pubsub_discovery_etcd PRIVATE Celix::pubsub_spi Celi install_celix_bundle(celix_pubsub_discovery_etcd EXPORT celix COMPONENT pubsub) -add_library(Celix::pubsub_discovery_etcd ALIAS celix_pubsub_discovery_etcd) +add_library(Celix::celix_pubsub_discovery_etcd ALIAS celix_pubsub_discovery_etcd) diff --git a/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v1/CMakeLists.txt b/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v1/CMakeLists.txt index d8a1ef8..6cbef5b 100644 --- a/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v1/CMakeLists.txt +++ b/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v1/CMakeLists.txt @@ -35,7 +35,7 @@ target_link_libraries(celix_pubsub_protocol_wire_v1 PRIVATE celix_wire_protocol_ install_celix_bundle(celix_pubsub_protocol_wire_v1 EXPORT celix COMPONENT pubsub) -add_library(Celix::pubsub_protocol_wire_v1 ALIAS celix_pubsub_protocol_wire_v1) +add_library(Celix::celix_pubsub_protocol_wire_v1 ALIAS celix_pubsub_protocol_wire_v1) if (ENABLE_TESTING) add_subdirectory(gtest) diff --git a/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v2/CMakeLists.txt b/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v2/CMakeLists.txt index 61324e2..450aa65 100644 --- a/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v2/CMakeLists.txt +++ b/bundles/pubsub/pubsub_protocol/pubsub_protocol_wire_v2/CMakeLists.txt @@ -35,7 +35,7 @@ target_link_libraries(celix_pubsub_protocol_wire_v2 PRIVATE celix_wire_protocol_ install_celix_bundle(celix_pubsub_protocol_wire_v2 EXPORT celix COMPONENT pubsub) -add_library(Celix::pubsub_protocol_wire_v2 ALIAS celix_pubsub_protocol_wire_v2) +add_library(Celix::celix_pubsub_protocol_wire_v2 ALIAS celix_pubsub_protocol_wire_v2) if (ENABLE_TESTING) add_subdirectory(gtest) diff --git a/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt index 1352e82..9b57bc4 100644 --- a/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt +++ b/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt @@ -36,7 +36,7 @@ target_link_libraries(celix_pubsub_serializer_avrobin PRIVATE Celix::pubsub_spi install_celix_bundle(celix_pubsub_serializer_avrobin EXPORT celix COMPONENT pubsub) -add_library(Celix::pubsub_serializer_avrobin ALIAS celix_pubsub_serializer_avrobin) +add_library(Celix::celix_pubsub_serializer_avrobin ALIAS celix_pubsub_serializer_avrobin) if (ENABLE_TESTING) add_subdirectory(gtest) diff --git a/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt index d1e9eb2..2b295f1 100644 --- a/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt +++ b/bundles/pubsub/pubsub_serializer_json/CMakeLists.txt @@ -36,7 +36,7 @@ target_link_libraries(celix_pubsub_serializer_json PRIVATE Celix::pubsub_spi Cel install_celix_bundle(celix_pubsub_serializer_json EXPORT celix COMPONENT pubsub) -add_library(Celix::pubsub_serializer_json ALIAS celix_pubsub_serializer_json) +add_library(Celix::celix_pubsub_serializer_json ALIAS celix_pubsub_serializer_json) if (ENABLE_TESTING) diff --git a/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt b/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt index e68dac9..98a4de0 100644 --- a/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt +++ b/bundles/pubsub/pubsub_topology_manager/CMakeLists.txt @@ -32,5 +32,5 @@ target_link_libraries(celix_pubsub_topology_manager PRIVATE UUID::lib) install_celix_bundle(celix_pubsub_topology_manager EXPORT celix COMPONENT pubsub) -add_library(Celix::pubsub_topology_manager ALIAS celix_pubsub_topology_manager) +add_library(Celix::celix_pubsub_topology_manager ALIAS celix_pubsub_topology_manager) diff --git a/bundles/shell/remote_shell/CMakeLists.txt b/bundles/shell/remote_shell/CMakeLists.txt index bdad5c9..92a75ad 100644 --- a/bundles/shell/remote_shell/CMakeLists.txt +++ b/bundles/shell/remote_shell/CMakeLists.txt @@ -21,6 +21,7 @@ if (REMOTE_SHELL) SYMBOLIC_NAME "apache_celix_remote_shell" VERSION "0.0.2" NAME "Apache Celix Remote Shell" + FILENAME celix_remote_shell GROUP "Celix/Shell" SOURCES src/activator diff --git a/bundles/shell/shell/CMakeLists.txt b/bundles/shell/shell/CMakeLists.txt index 0fb5bfb..c89e85a 100644 --- a/bundles/shell/shell/CMakeLists.txt +++ b/bundles/shell/shell/CMakeLists.txt @@ -51,6 +51,7 @@ if (SHELL) SYMBOLIC_NAME "apache_celix_c_shell" VERSION "2.1.0" NAME "Apache Celix C Shell" + FILENAME celix_shell GROUP "Celix/Shell" SOURCES src/c_shell_activator.c @@ -73,6 +74,7 @@ if (SHELL) SYMBOLIC_NAME "apache::celix::CxxShell" VERSION "2.1.0" NAME "Apache Celix CXX Shell" + FILENAME celix_ShellCxx GROUP "Celix/Shell" SOURCES src/Shell.cc diff --git a/bundles/shell/shell_bonjour/CMakeLists.txt b/bundles/shell/shell_bonjour/CMakeLists.txt index 771ccdb..e3b0889 100644 --- a/bundles/shell/shell_bonjour/CMakeLists.txt +++ b/bundles/shell/shell_bonjour/CMakeLists.txt @@ -28,6 +28,7 @@ if (SHELL_BONJOUR) add_celix_bundle(bonjour_shell VERSION "1.0.0" + FILENAME celix_bonjour_shell GROUP "Celix/Shell" SOURCES private/src/activator.c diff --git a/bundles/shell/shell_tui/CMakeLists.txt b/bundles/shell/shell_tui/CMakeLists.txt index 193cb8e..909d5df 100644 --- a/bundles/shell/shell_tui/CMakeLists.txt +++ b/bundles/shell/shell_tui/CMakeLists.txt @@ -21,6 +21,7 @@ if (SHELL_TUI) SYMBOLIC_NAME "apache_celix_shell_tui" VERSION "1.1.0" NAME "Apache Celix Shell TUI" + FILENAME celix_shell_tui GROUP "Celix/Shell" SOURCES private/src/activator diff --git a/bundles/shell/shell_wui/CMakeLists.txt b/bundles/shell/shell_wui/CMakeLists.txt index 50bdf0d..9ebc25c 100644 --- a/bundles/shell/shell_wui/CMakeLists.txt +++ b/bundles/shell/shell_wui/CMakeLists.txt @@ -22,6 +22,7 @@ if (SHELL_WUI) SYMBOLIC_NAME "apache_celix_shell_wui" VERSION "1.0.0" NAME "Apache Celix Shell WUI" + FILENAME celix_shell_wui GROUP "Celix/Shell" SOURCES src/shell_wui_bundle_activator.c diff --git a/cmake/AddGTest.cmake b/cmake/AddGTest.cmake index c57d57b..d7719ff 100644 --- a/cmake/AddGTest.cmake +++ b/cmake/AddGTest.cmake @@ -19,7 +19,7 @@ include(FetchContent) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.10.0 + GIT_TAG release-1.11.0 ) FetchContent_MakeAvailable(googletest) diff --git a/cmake/CelixConfig.cmake b/cmake/CelixConfig.cmake index 6c7acb4..0c7caf3 100644 --- a/cmake/CelixConfig.cmake +++ b/cmake/CelixConfig.cmake @@ -68,6 +68,17 @@ if (TARGET Celix::dependency_manager_cxx) set(CELIX_DM_CXX_STATIC_LIB $<TARGET_PROPERTY:Celix::dependency_manager_cxx,INTERFACE_INCLUDE_DIRECTORIES>) endif () +#Setting up pubsub admin alias to the v1 version. +if (TARGET Celix::pubsub_admin_zmq_v1) + add_library(Celix::celix_pubsub_admin_zmq ALIAS Celix::pubsub_admin_zmq_v1) +endif () +if (TARGET Celix::pubsub_admin_tcp_v1) + add_library(Celix::celix_pubsub_admin_tcp ALIAS Celix::pubsub_admin_tcp_v1) +endif () +if (TARGET Celix::pubsub_admin_websocket_v1) + add_library(Celix::celix_pubsub_admin_websocket ALIAS Celix::pubsub_admin_websocket_v1) +endif () + set(CELIX_BUNDLES_DIR ${REL_INSTALL_DIR}/share/celix/bundles) set(CELIX_SHELL_BUNDLE ${CELIX_BUNDLES_DIR}/shell.zip) set(CELIX_SHELL_TUI_BUNDLE ${CELIX_BUNDLES_DIR}/shell_tui.zip) diff --git a/cmake/cmake_celix/BundlePackaging.cmake b/cmake/cmake_celix/BundlePackaging.cmake index d137046..57004c8 100644 --- a/cmake/cmake_celix/BundlePackaging.cmake +++ b/cmake/cmake_celix/BundlePackaging.cmake @@ -734,6 +734,58 @@ function(celix_bundle_description BUNDLE DESC) set_target_properties(${BUNDLE} PROPERTIES "BUNDLE_DESCRIPTION" ${DESC}) endfunction() +#[[ +Get bundle filename from an (imported) bundle target taking into account the +used CMAKE_BUILD_TYPE and available bundle configurations. + +celix_get_bundle_filename(<bundle_target> VARIABLE_NAME) + +Example: celix_get_bundle_filename(Celix::shell SHELL_BUNDLE_FILENAME) + +]] +function(celix_get_bundle_filename) + if (TARGET ${ARGV0}) + get_target_property(_IMP ${ARGV0} BUNDLE_IMPORTED) + if (_IMP) + _celix_extract_imported_bundle_info(${ARGV0}) + set(${ARGV1} ${BUNDLE_FILENAME} PARENT_SCOPE) + else () + get_target_property(BF ${ARGV0} BUNDLE_FILENAME) + set(${ARGV1} ${BF} PARENT_SCOPE) + endif () + else () + message(FATAL_ERROR "Provided argument is not a CMake target: ${ARGV0}") + endif () +endfunction () + +#[[ +Get bundle file (absolute path to a bundle) from an (imported) bundle +target taking into account the used CMAKE_BUILD_TYPE and available +bundle configurations. + +celix_get_bundle_file(<bundle_target> VARIABLE_NAME) + +Example: celix_get_bundle_file(Celix::shell SHELL_BUNDLE_FILE) + +]] +function(celix_get_bundle_file) + if (TARGET ${ARGV0}) + get_target_property(_IMP ${ARGV0} BUNDLE_IMPORTED) + if (_IMP) + _celix_extract_imported_bundle_info(${ARGV0}) + set(${ARGV1} ${BUNDLE_FILE} PARENT_SCOPE) + unset(BUNDLE_FILE) + unset(BUNDLE_FILENAME) + else () + get_target_property(BF ${ARGV0} BUNDLE_FILE) + set(${ARGV1} ${BF} PARENT_SCOPE) + endif () + else () + message(FATAL_ERROR "Provided argument is not a CMake target: ${ARGV0}") + endif () +endfunction () + + function(install_bundle) message(DEPRECATION "install_bundle is deprecated, use install_celix_bundle instead.") install_celix_bundle(${ARGN}) @@ -930,63 +982,6 @@ endforeach() endif () endfunction() -#[[ -Get bundle file (absolute path to bundle) from an (imported) bundle -target taking into account the used CMAKE_BUILD_TYPE and available -bundle configurations. - -celix_get_bundle_file(<bundle_target> VARIABLE_NAME) - -Example: celix_get_bundle_file(Celix::shell SHELL_BUNDLE_FILE) - -]] -function(celix_get_bundle_file) - -if (TARGET ${ARGV0}) - get_target_property(_IMP ${ARGV0} BUNDLE_IMPORTED) - if (_IMP) - _celix_extract_imported_bundle_info(${ARGV0}) - set(${ARGV1} ${BUNDLE_FILE} PARENT_SCOPE) - unset(BUNDLE_FILE) - unset(BUNDLE_FILENAME) - else () - get_target_property(BF ${ARGV0} BUNDLE_FILE) - set(${ARGV1} ${BF} PARENT_SCOPE) - endif () -else () - message(FATAL_ERROR "Provided argument is not a CMake target: ${ARGV0}") -endif () - -endfunction () - -#[[ -Get bundle filename from an (imported) bundle target taking into account the -used CMAKE_BUILD_TYPE and available bundle configurations. - -celix_get_bundle_filename(<bundle_target> VARIABLE_NAME) - -Example: celix_get_bundle_filename(Celix::shell SHELL_BUNDLE_FILENAME) - -]] -function(celix_get_bundle_filename) - -if (TARGET ${ARGV0}) - get_target_property(_IMP ${ARGV0} BUNDLE_IMPORTED) - if (_IMP) - _celix_extract_imported_bundle_info(${ARGV0}) - set(${ARGV1} ${BUNDLE_FILENAME} PARENT_SCOPE) - else () - get_target_property(BF ${ARGV0} BUNDLE_FILENAME) - set(${ARGV1} ${BF} PARENT_SCOPE) - endif () -else () - message(FATAL_ERROR "Provided argument is not a CMake target: ${ARGV0}") -endif () - -endfunction () - - - ######################################### "Private" function ########################################################### diff --git a/cmake/cmake_celix/Generic.cmake b/cmake/cmake_celix/Generic.cmake index e44d3fa..1d13aca 100644 --- a/cmake/cmake_celix/Generic.cmake +++ b/cmake/cmake_celix/Generic.cmake @@ -15,13 +15,8 @@ # specific language governing permissions and limitations # under the License. -function(install_celix_targets) - install_celix_bundle_targets(${ARGN}) -endfunction () - #[[ -Add bundles as dependencies to a cmake target, so that the bundle zip files are created before the cmake target is - created. +Add bundles as dependencies to a cmake target, so that the bundle zip files will be created before the cmake target. add_celix_bundle_dependencies(<cmake_target> bundles... @@ -41,4 +36,8 @@ function(add_celix_bundle_dependencies) endif () endif() endforeach() -endfunction() \ No newline at end of file +endfunction() + +function(install_celix_targets) + install_celix_bundle_targets(${ARGN}) +endfunction () \ No newline at end of file diff --git a/documents/cmake_commands/README.md b/documents/cmake_commands/README.md index 92ce35d..6f9a398 100644 --- a/documents/cmake_commands/README.md +++ b/documents/cmake_commands/README.md @@ -163,6 +163,34 @@ Set bundle group. celix_bundle_group(<bundle_target> bundle group) ``` +## celix_get_bundle_filename +Get bundle filename from an (imported) bundle target taking into account the +used CMAKE_BUILD_TYPE and available bundle configurations. + +```CMake +celix_get_bundle_filename(<bundle_target> VARIABLE_NAME) +``` + +Example: `celix_get_bundle_filename(Celix::shell SHELL_BUNDLE_FILENAME)` will result in `celix_shell.zip` for a `RelWithDebInfo` cmake build type and in `celix_shell-Debug.zip` for a `Debug` cmake build type (if the a debug bundle version exists). + +## celix_get_bundle_file +Get bundle file (absolute path to a bundle) from an (imported) bundle target taking into account the used CMAKE_BUILD_TYPE and available bundle configurations. + +```CMake +celix_get_bundle_file(<bundle_target> VARIABLE_NAME) +``` + +Example: `celix_get_bundle_file(Celix::shell SHELL_BUNDLE_FILE)` + +## add_celix_bundle_dependencies +Add bundles as dependencies to a cmake target, so that the bundle zip files will be created before the cmake target. + +```CMake +add_celix_bundle_dependencies(<cmake_target> + bundles... +) +``` + ## install_celix_bundle Install bundle when 'make install' is executed. Bundles are installed at `<install-prefix>/share/<project_name>/bundles`.
