This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/refactor_bundle_cache in repository https://gitbox.apache.org/repos/asf/celix.git
commit c6cbbe0298266875da599bf56a6f2aa3755d72b9 Merge: 0cf6420a 043b4f38 Author: PengZheng <[email protected]> AuthorDate: Tue Feb 7 16:46:58 2023 +0800 Merge branch 'master' into feature/refactor_bundle_cache # Conflicts: # bundles/http_admin/http_admin/CMakeLists.txt .github/workflows/celix_etcdlib.yml | 2 +- .github/workflows/celix_promise.yml | 2 +- .github/workflows/coverage.yml | 10 +- .github/workflows/coverity-scan.yml | 6 +- .github/workflows/macos.yml | 21 +- .github/workflows/ubuntu.yml | 12 +- CMakeLists.txt | 8 +- bundles/http_admin/CMakeLists.txt | 3 +- bundles/http_admin/civetweb/CMakeLists.txt | 26 +- bundles/http_admin/civetweb/include/civetweb.h | 1541 -- bundles/http_admin/civetweb/src/civetweb.c | 19758 ------------------- bundles/http_admin/civetweb/src/civetweb_dummy.c | 20 + bundles/http_admin/civetweb/src/handle_form.inl | 1060 - bundles/http_admin/civetweb/src/md5.inl | 471 - bundles/http_admin/civetweb/src/sha1.inl | 323 - bundles/http_admin/civetweb/src/timer.inl | 260 - bundles/http_admin/http_admin/CMakeLists.txt | 1 - bundles/http_admin/http_admin_api/CMakeLists.txt | 2 +- bundles/pubsub/integration/CMakeLists.txt | 5 +- bundles/remote_services/CMakeLists.txt | 1 - .../remote_services/civetweb/include/civetweb.h | 657 - bundles/remote_services/civetweb/src/civetweb.c | 7907 -------- bundles/remote_services/civetweb/src/md5.inl | 461 - .../discovery_common/CMakeLists.txt | 3 +- .../src/endpoint_discovery_server.c | 4 +- .../discovery_configured/CMakeLists.txt | 5 +- .../remote_services/discovery_etcd/CMakeLists.txt | 5 +- .../remote_services/discovery_shm/CMakeLists.txt | 5 +- .../remote_service_admin_dfi/CMakeLists.txt | 4 +- .../remote_service_admin_dfi/gtest/CMakeLists.txt | 5 + .../src/remote_service_admin_dfi.c | 6 +- bundles/shell/shell_wui/CMakeLists.txt | 1 - cmake/AddGTest.cmake | 4 +- cmake/CelixConfig.cmake | 3 + .../CMakeLists.txt => cmake/Findcivetweb.cmake | 30 +- conanfile.py | 4 + .../celix-examples/http_example/CMakeLists.txt | 1 - examples/conan_test_package/my_psa_activator.c | 1 + examples/conan_test_package/my_rsa_activator.c | 7 + 39 files changed, 123 insertions(+), 32522 deletions(-) diff --cc bundles/http_admin/http_admin/CMakeLists.txt index d0b2bbbc,2f27ba4b..925440e3 --- a/bundles/http_admin/http_admin/CMakeLists.txt +++ b/bundles/http_admin/http_admin/CMakeLists.txt @@@ -30,7 -30,8 +30,6 @@@ add_celix_bundle(http_admi target_include_directories(http_admin PRIVATE src) target_link_libraries(http_admin PUBLIC Celix::http_admin_api) - celix_bundle_private_libs(http_admin civetweb_shared) -file(MAKE_DIRECTORY resources) -celix_bundle_add_dir(http_admin resources/ DESTINATION root/) celix_deprecated_utils_headers(http_admin)
