This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/remove_dfi_dep in repository https://gitbox.apache.org/repos/asf/celix.git
commit 4ae643563a1cf0b8027692592f4b9248783b77d3 Merge: ff553fc3 043b4f38 Author: PengZheng <[email protected]> AuthorDate: Thu Feb 9 10:38:40 2023 +0800 Merge branch 'master' into feature/remove_dfi_dep # Conflicts: # bundles/pubsub/integration/CMakeLists.txt # conanfile.py .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/pubsub/integration/CMakeLists.txt index 87d79e69,a503bedb..59aebe27 --- a/bundles/pubsub/integration/CMakeLists.txt +++ b/bundles/pubsub/integration/CMakeLists.txt @@@ -346,7 -347,7 +347,7 @@@ if (PUBSUB_INTEGRATION pubsub_tst pubsub_serializer ) - target_link_libraries(pubsub_websocket_v2_tests PRIVATE Celix::pubsub_api Celix::dfi jansson::jansson civetweb_shared GTest::gtest GTest::gtest_main) - target_link_libraries(pubsub_websocket_v2_tests PRIVATE Celix::pubsub_api jansson::jansson GTest::gtest GTest::gtest_main civetweb::civetweb) ++ target_link_libraries(pubsub_websocket_v2_tests PRIVATE Celix::pubsub_api Celix::dfi jansson::jansson GTest::gtest GTest::gtest_main civetweb::civetweb) target_include_directories(pubsub_websocket_v2_tests SYSTEM PRIVATE gtest) add_test(NAME pubsub_websocket_v2_tests COMMAND pubsub_websocket_v2_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_websocket_v2_tests,CONTAINER_LOC>) setup_target_for_coverage(pubsub_websocket_v2_tests SCAN_DIR ..) diff --cc conanfile.py index 7c7aa207,7a440538..5d5a7e9e --- a/conanfile.py +++ b/conanfile.py @@@ -223,10 -223,9 +223,13 @@@ class CelixConan(ConanFile) self.options['zeromq'].shared = True self.requires("czmq/4.2.0") self.options['czmq'].shared = True + if self.options.build_http_admin or self.options.build_remote_service_admin: + self.requires("civetweb/1.15") + self.options['civetweb'].shared = True + if self.options.build_dfi: + self.requires("libffi/[>=3.2.1 <4.0.0]") + self.options['libffi'].shared = True + def _configure_cmake(self): if self._cmake:
