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

pengzheng pushed a commit to branch feature/579-automatic-dependency-deduction
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 7eef42ed08cf0dd2d4628ec552503c48d8fbbb60
Merge: 0c216c80 f9e28753
Author: PengZheng <[email protected]>
AuthorDate: Mon Jul 3 14:32:21 2023 +0800

    Merge branch 'master' into feature/579-automatic-dependency-deduction

 bundles/pubsub/pubsub_spi/CMakeLists.txt           |  2 +
 bundles/pubsub/pubsub_utils/CMakeLists.txt         |  1 +
 .../discovery_zeroconf/gtest/CMakeLists.txt        |  2 +-
 .../rsa_shm/gtest/CMakeLists.txt                   |  2 +-
 .../thpool/CMakeLists.txt                          |  2 +-
 bundles/remote_services/rsa_common/CMakeLists.txt  | 19 +++++---
 .../rsa_common/gtest/CMakeLists.txt                |  2 +-
 .../remote_services/rsa_dfi_utils/CMakeLists.txt   |  1 +
 .../rsa_rpc_json/gtest/CMakeLists.txt              |  2 +-
 libs/error_injector/CMakeLists.txt                 |  1 +
 libs/error_injector/stat/CMakeLists.txt            |  1 +
 libs/error_injector/stat/include/stat_ei.h         |  2 +
 libs/error_injector/stat/src/stat_ei.cc            | 17 ++++++--
 .../{unistd => stdlib}/CMakeLists.txt              | 12 ++---
 .../unistd_ei.h => stdlib/include/stdlib_ei.h}     | 11 +++--
 .../src/unistd_ei.cc => stdlib/src/stdlib_ei.cc}   | 19 ++++----
 libs/error_injector/unistd/CMakeLists.txt          |  6 ++-
 libs/error_injector/unistd/include/unistd_ei.h     |  4 ++
 libs/error_injector/unistd/src/unistd_ei.cc        | 23 +++++++++-
 libs/framework/gtest/CMakeLists.txt                |  2 +
 libs/framework/gtest/config.properties.in          |  2 +-
 .../BundleArchiveWithErrorInjectionTestSuite.cc    | 43 ++++++++++++++----
 .../src/CelixBundleContextBundlesTestSuite.cc      | 31 ++++++++-----
 .../CelixFrameworkUtilsErrorInjectionTestSuite.cc  | 26 +++++++++++
 .../gtest/src/CelixFrameworkUtilsTestSuite.cc      | 32 +++++++++++---
 libs/framework/include_deprecated/bundle_archive.h |  2 +-
 libs/framework/src/bundle_archive.c                | 51 ++++++++++------------
 libs/framework/src/bundle_archive_private.h        |  5 ---
 libs/framework/src/celix_framework_utils.c         | 29 +++++++++---
 libs/framework/src/framework.c                     | 28 ++++++------
 30 files changed, 266 insertions(+), 114 deletions(-)


Reply via email to