This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch feature/remove_dfi_dep
in repository https://gitbox.apache.org/repos/asf/celix.git
from ff553fc3 Make ffi a private dependency of dfi.
add 84d7e048 Use shared civetweb via find_package.
add 0f1435d3 Use Ubuntu's libcivetweb.
add 8f1d6330 Use Ubuntu 22.04 for CI.
add 07ac3629 Add missing Ubuntu 22.04 update for CI.
add 3d4fcb63 Fix missing target civetweb::server for Ubuntu build-apt.
add b7b46ee0 Merge branch 'master' into feature/civetweb_integration
add f3315369 Fix false positive gcc warning on legitimate use of `strndup`.
add 2d09caed Use civetweb via Conan.
add c1c90cfc Use Ubuntu 20.04 for shorter Conan build time.
add 80792ef4 Fix conan create error.
add 5c8dea25 Work-around cpputest conan package error.
add 070001f6 Fetch civetweb when it's not included in package manager.
add 9dbcd183 Fix coverage conan build.
add 33906523 Enable more C++ testing.
add 389846bc Use find module to get civetweb.
add f9a23d73 Build civetweb shared object.
add dcc06f5d Make civetweb shared library loadable when build in the Celix
project.
add 2145bc7e Add missing find_package.
add a3e4258e Try to reproduce #471.
add d469ba6d Re-enable `conan create` for masOS.
add ed8c00fe mdnsresponder conan package is not supported on macOS.
add 4e7709b4 mdnsresponder conan package is not supported on macOS.
add 0cc6f0af mdnsresponder conan package is not supported on macOS.
add 1f7f5cc6 Fix missing deprecated headers in macOS `conan create`.
add 08f30606 Using the latest macOS for build-conan.
add 4ac1ae42 Fix toolchain inconsistency for macOS's conan build.
add 40dc2497 Revert "Fix toolchain inconsistency for macOS's conan build."
add cb6d929d Fix toolchain inconsistency for macOS's conan build.
add de362a17 Fix linking error for macOS's `conan create`.
add 8cdb09a6 Workaround cpputest conan package error.
add b47a68c7 Eliminate compiler warnings.
add cbb662ed Don't install googletest when installing Celix.
add 24035c9f Reintroduce a dummy shared lib Celix::civetweb_shared.
add 043b4f38 Merge pull request #477 from
apache/feature/civetweb_integration
new 4ae64356 Merge branch 'master' into feature/remove_dfi_dep
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 -------------------
.../http_admin/civetweb/src/civetweb_dummy.c | 17 +-
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 -
bundles/remote_services/civetweb/CMakeLists.txt | 26 -
.../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 | 40 +-
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 +
40 files changed, 104 insertions(+), 32574 deletions(-)
delete mode 100644 bundles/http_admin/civetweb/include/civetweb.h
delete mode 100644 bundles/http_admin/civetweb/src/civetweb.c
copy libs/error_injector/malloc/include/malloc_ei.h =>
bundles/http_admin/civetweb/src/civetweb_dummy.c (73%)
delete mode 100644 bundles/http_admin/civetweb/src/handle_form.inl
delete mode 100644 bundles/http_admin/civetweb/src/md5.inl
delete mode 100644 bundles/http_admin/civetweb/src/sha1.inl
delete mode 100644 bundles/http_admin/civetweb/src/timer.inl
delete mode 100644 bundles/remote_services/civetweb/CMakeLists.txt
delete mode 100644 bundles/remote_services/civetweb/include/civetweb.h
delete mode 100644 bundles/remote_services/civetweb/src/civetweb.c
delete mode 100644 bundles/remote_services/civetweb/src/md5.inl
copy examples/CMakeLists.txt => cmake/Findcivetweb.cmake (55%)
