This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/483-conan-2-support
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 681c6ef7e01e2c543aeec9349b318bc8aced6bc5
Merge: 60b59416 9647e660
Author: PengZheng <howto...@gmail.com>
AuthorDate: Sun Aug 20 20:25:23 2023 +0800
Merge branch 'master' into feature/483-conan-2-support
bundles/logging/log_helper/src/celix_log_helper.c | 13 +-
libs/error_injector/CMakeLists.txt | 1 +
libs/error_injector/stdio/CMakeLists.txt | 3 +
libs/error_injector/stdio/include/stdio_ei.h | 6 +
libs/error_injector/stdio/src/stdio_ei.cc | 48 ++-
.../string}/CMakeLists.txt | 17 +-
.../string/include/string_ei.h} | 31 +-
.../string/src/string_ei.cc} | 31 +-
libs/framework/CMakeLists.txt | 2 +-
libs/framework/gtest/CMakeLists.txt | 5 +
.../gtest/src/CxxBundleContextTestSuite.cc | 7 +
.../gtest/src/ManifestErrorInjectionTestSuite.cc | 176 ++++++++
libs/framework/gtest/src/ManifestTestSuite.cc | 307 ++++++++++++++
libs/framework/include/celix/BundleContext.h | 8 +
libs/framework/include/celix_bundle_context.h | 7 +
libs/framework/include/celix_log.h | 2 +
libs/framework/include_deprecated/manifest.h | 8 +
libs/framework/src/attribute.c | 65 ---
libs/framework/src/bundle_archive.c | 2 +
libs/framework/src/bundle_context.c | 4 +
libs/framework/src/capability.c | 1 -
libs/framework/src/celix_log.c | 13 +-
libs/framework/src/manifest.c | 454 +++++++++++----------
libs/framework/src/manifest_parser.c | 1 -
libs/framework/src/requirement.c | 8 +-
libs/utils/error_injector/CMakeLists.txt | 3 +-
.../error_injector/{ => hash_map}/CMakeLists.txt | 17 +-
.../error_injector/hash_map/include/hmap_ei.h} | 29 +-
.../error_injector/hash_map/src/hmap_ei.cc} | 32 +-
libs/utils/gtest/CMakeLists.txt | 15 +-
.../gtest/src/CelixUtilsAutoCleanupTestSuite.cc | 7 +-
libs/utils/gtest/src/ErrErrorInjectionTestSuite.cc | 2 -
libs/utils/gtest/src/ErrTestSuite.cc | 41 +-
.../src/PropertiesErrorInjectionTestSuite.cc} | 32 +-
libs/utils/include/celix_err.h | 12 +
.../include/celix_stdio_cleanup.h} | 28 +-
libs/utils/src/celix_err.c | 37 +-
37 files changed, 1027 insertions(+), 448 deletions(-)
