This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/bundle_linker_script
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 577d9a961fd9b2219babe11176cbf2cd3470dc41
Merge: 5ab7fcf6 698ba086
Author: Pepijn Noltes <[email protected]>
AuthorDate: Sun Apr 30 19:40:14 2023 +0200

    Merge remote-tracking branch 'origin/master' into 
feature/bundle_linker_script

 bundles/deployment_admin/CMakeLists.txt            |   1 +
 bundles/http_admin/http_admin/src/activator.c      |   3 +-
 bundles/http_admin/http_admin/src/http_admin.c     |   1 -
 .../http_admin/http_admin/src/websocket_admin.c    |   4 -
 .../http_admin/http_admin/src/websocket_admin.h    |   2 +-
 bundles/logging/log_helper/CMakeLists.txt          |   1 +
 bundles/logging/log_service_v2/CMakeLists.txt      |   1 +
 .../src/deprecated_log_writer_stdout_activator.c   |   2 +-
 .../examples/pubsub/publisher/CMakeLists.txt       |   1 +
 .../private/include/pubsub_publisher_private.h     |   7 +-
 .../publisher/private/src/ps_pub_activator.c       |   6 +-
 .../publisher/private/src/pubsub_publisher.c       |   3 +-
 .../pubsub/pubsub_websocket/CMakeLists.txt         |   1 +
 .../examples/pubsub/subscriber/CMakeLists.txt      |   1 +
 .../subscriber/private/src/ps_sub_activator.c      |  16 +-
 .../pubsub/integration/gtest/loopback_activator.c  |   2 +-
 .../integration/gtest/serializer_activator.cc      |   2 +-
 bundles/pubsub/integration/gtest/sut_activator.c   |   2 +-
 .../integration/gtest/sut_endpoint_activator.c     |   2 +-
 bundles/pubsub/integration/gtest/tst_activator.c   |   2 +-
 .../integration/gtest/tst_endpoint_activator.c     |   2 +-
 bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt     |   1 +
 .../pubsub/pubsub_admin_tcp/src/psa_activator.c    |   2 +-
 .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.c |   1 +
 .../pubsub/pubsub_admin_tcp/src/pubsub_tcp_admin.h |   1 -
 bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt  |   1 +
 .../pubsub/pubsub_admin_websocket/CMakeLists.txt   |   1 +
 bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt     |   1 +
 .../pubsub/pubsub_admin_zmq/src/psa_activator.c    |   2 +-
 bundles/pubsub/pubsub_discovery/CMakeLists.txt     |   1 +
 .../pubsub_protocol_wire_v1/CMakeLists.txt         |   1 +
 .../pubsub_serializer_avrobin/CMakeLists.txt       |   1 +
 .../PubSubAvrobinSerializationProviderTestSuite.cc |   4 +-
 .../pubsub/pubsub_serializer_json/CMakeLists.txt   |   1 +
 .../src/ps_json_serializer_activator.c             |   2 +-
 .../src/pubsub_serializer_impl.c                   |   3 +-
 bundles/pubsub/pubsub_spi/CMakeLists.txt           |   1 +
 bundles/pubsub/pubsub_spi/src/pubsub_endpoint.c    |   7 +-
 .../pubsub_topology_manager/src/pstm_activator.c   |   5 +-
 .../src/pubsub_topology_manager.h                  |   2 -
 bundles/pubsub/pubsub_utils/CMakeLists.txt         |   1 +
 .../gtest/src/PubSubMatchingTestSuite.cpp          |   3 +-
 .../src/PubSubSerializationProviderTestSuite.cc    |   3 +-
 .../pubsub/pubsub_utils/include/pubsub_matching.h  |   1 -
 bundles/pubsub/pubsub_utils/include/pubsub_utils.h |   1 -
 .../src/pubsub_serialization_provider.c            |   1 +
 bundles/pubsub/pubsub_utils/src/pubsub_utils.c     |   1 +
 .../discovery_common/CMakeLists.txt                |   1 +
 .../src/DiscoveryZeroconfActivatorTestSuite.cc     |   3 -
 .../src/DiscoveryZeroconfAnnouncerTestSuite.cc     |   6 +-
 .../src/DiscoveryZeroconfIntegrationTestSuite.cc   |   6 +-
 .../remote_service_admin_dfi/CMakeLists.txt        |   1 +
 .../remote_service_admin_dfi/gtest/CMakeLists.txt  |   2 +
 .../gtest/src/tst_activator.c                      |   9 +-
 .../src/remote_service_admin_activator.c           |   2 +-
 .../rsa_shm/CMakeLists.txt                         |   2 +-
 .../rsa_shm/gtest/CMakeLists.txt                   |   1 +
 bundles/remote_services/rsa_common/CMakeLists.txt  |   1 +
 .../rsa_dfi_utils/gtest/src/DfiUtilsTestSuite.cc   |   4 +-
 .../remote_services/rsa_dfi_utils/src/dfi_utils.c  |  99 ++--
 .../remote_services/rsa_rpc_json/CMakeLists.txt    |   1 +
 .../gtest/src/RsaJsonRpcActivatorTestSuite.cc      |   6 +-
 .../rsa_rpc_json/gtest/src/RsaJsonRpcTestSuite.cc  |  16 +-
 .../rsa_rpc_json/src/rsa_json_rpc_activator.c      |   2 +-
 .../rsa_rpc_json/src/rsa_json_rpc_endpoint_impl.h  |   1 -
 .../rsa_rpc_json/src/rsa_json_rpc_impl.c           |   7 +-
 .../rsa_rpc_json/src/rsa_json_rpc_impl.h           |   1 -
 .../rsa_rpc_json/src/rsa_json_rpc_proxy_impl.h     |   1 -
 .../rsa_rpc_json/src/rsa_request_sender_tracker.c  |   3 +-
 bundles/remote_services/rsa_spi/CMakeLists.txt     |   1 -
 .../topology_manager/CMakeLists.txt                |   1 +
 .../topology_manager/tms_tst/CMakeLists.txt        |   1 +
 .../topology_manager/tms_tst/bundle/CMakeLists.txt |   1 +
 bundles/shell/remote_shell/CMakeLists.txt          |   1 +
 bundles/shell/remote_shell/src/activator.c         |   8 +-
 bundles/shell/shell/src/c_shell_activator.c        |   2 -
 bundles/shell/shell/src/help_command.c             |   7 +-
 bundles/shell/shell/src/install_command.c          |   6 +-
 bundles/shell/shell/src/query_command.c            |  13 +-
 bundles/shell/shell_bonjour/CMakeLists.txt         |   1 +
 cmake/celix_project/CelixProject.cmake             |  21 +-
 libs/dependency_manager/CMakeLists.txt             |   2 +
 libs/dependency_manager_cxx/CMakeLists.txt         |   1 +
 libs/error_injector/api/celix_error_injector.h     |  48 --
 .../src/celix_bundle_context_ei.cc                 |   4 +-
 .../celix_threads/src/celix_threads_ei.cc          |   4 +-
 libs/error_injector/eventfd/include/eventfd_ei.h   |   1 -
 libs/error_injector/eventfd/src/eventfd_ei.cc      |   5 +-
 .../mdnsresponder/src/mdnsresponder_ei.cc          |  10 +-
 libs/framework/CMakeLists.txt                      |   6 +-
 libs/framework/gtest/CMakeLists.txt                |  11 +-
 .../BundleArchiveWithErrorInjectionTestSuite.cc    |   7 +-
 ...s.cpp => CelixBundleContextBundlesTestSuite.cc} |  88 ++--
 ....cpp => CelixBundleContextServicesTestSuite.cc} | 106 ++--
 ...amework_test.cpp => CelixFrameworkTestSuite.cc} |  37 ++
 .../gtest/src/CelixFrameworkUtilsTestSuite.cc      |  12 +-
 .../gtest/src/MultipleFrameworkTestSuite.cc        |  56 +++
 .../gtest/src/multiple_frameworks_test.cpp         | 103 ----
 libs/framework/include/celix_bundle_context.h      |  18 +-
 libs/framework/include/celix_framework.h           |   9 +-
 libs/framework/include/celix_log.h                 |   1 -
 .../{include => include_deprecated}/archive.h      |   0
 .../{include => include_deprecated}/bundle.h       |   0
 .../bundle_activator.h                             |   0
 .../bundle_archive.h                               |   0
 .../bundle_context.h                               |   0
 .../{include => include_deprecated}/bundle_event.h |   0
 .../bundle_listener.h                              |   0
 .../bundle_revision.h                              |   0
 .../{include => include_deprecated}/bundle_state.h |   0
 .../{include => include_deprecated}/capability.h   |   0
 .../{include => include_deprecated}/dm_activator.h |   0
 .../{include => include_deprecated}/dm_component.h |   0
 .../dm_dependency_manager.h                        |   0
 .../dm_service_dependency.h                        |   0
 .../{include => include_deprecated}/framework.h    |   0
 .../framework_event.h                              |   0
 .../framework_exports.h                            |   0
 .../framework_listener.h                           |   0
 .../listener_hook_service.h                        |   0
 .../{include => include_deprecated}/manifest.h     |   0
 .../{include => include_deprecated}/module.h       |   0
 .../{include => include_deprecated}/requirement.h  |   0
 .../service_event.h                                |   0
 .../service_factory.h                              |   0
 .../service_listener.h                             |   0
 .../service_reference.h                            |   0
 .../service_registration.h                         |   0
 .../service_registry.h                             |   0
 .../service_tracker.h                              |   0
 .../service_tracker_customizer.h                   |   0
 .../{include => include_deprecated}/wire.h         |   0
 libs/framework/src/bundle_context.c                |  10 +-
 libs/framework/src/framework.c                     |  14 +-
 libs/utils/CMakeLists.txt                          |   6 -
 libs/utils/gtest/CMakeLists.txt                    |   1 +
 libs/utils/gtest/src/ConvertUtilsTestSuite.cc      |  16 +
 libs/utils/gtest/src/CxxFilterTestSuite.cc         |  56 ++-
 libs/utils/gtest/src/FilterTestSuite.cc            | 433 ++++++++++++++++
 libs/utils/include/celix_filter.h                  |   7 +-
 .../{include => include_deprecated}/celixbool.h    |   0
 libs/utils/private/test/filter_test.cpp            | 546 ---------------------
 libs/utils/src/filter.c                            | 134 ++++-
 143 files changed, 1074 insertions(+), 1027 deletions(-)


Reply via email to