This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
from 9cf8bc39 Merge pull request #404 from apache/hotfix/array_list_equality
add 58a2f881 cxx_remote_service_admin as a separate subproject.
add 9beae45e Merge branch 'master' into conan_support
add 8745fde2 Merge branch 'master' into conan_support
add 7a4e5e0d Revert "cxx_remote_service_admin as a separate subproject."
add 1bbaba1c Add initial conan support.
add ecd4a510 Use CelixConfig.cmake instead of conan's own mechanism, and
add missing dependency.
add ba863246 Fix misuse of find_package and find_dependency in
CelixConfig.cmake.
add 289bf9ef Add missing options and loosen libzip requirement.
add 1e9e20a1 Package modules improvements.
add 9083b3de Fix bonjour shell compilation failure.
add fe5dc9ba Improve the modular structure of cmake project, update
conanfile accordingly.
add 3361fe3b Add missing license.
add 66724b94 Add test_package for the framework, http_admin and log_admin.
add c0c0c6d6 Fix incorrect order of cmake.definitions and cmake.configure,
avoid intrusive usage of conan in CMakeLists.txt.
add b3ee2315 Add test_package for syslog_writer.
add 98191a98 Merge branch 'hotfix/framework_shutdown_deadlock' into
conan_support
add b34e5ff1 Add test_package for shell-related bundles, and remove
irrelevant options from conan package ID calculation.
add 93f358de Add missing find_dependency in CelixConfig.cmake, and add
test_package for etcdlib, launcher, and promises.
add b4606a16 Add test_package for pushstreams, fix compilation error, and
make FindCppUTest.cmake compatible with the one generated by conan.
add 1bb7c66f Add build_all option, remove irrelevant packaging options,
add workaround for CMake shared library private linking issue.
add ee74c8fb Add test_package for pubsub and cxx_shell, add missing
requirement for rapidjson.
add 7bff6a05 Add test_package for remaining pubsub components.
add bd1fdee6 Merge branch 'hotfix/psa_memory_leak' into conan_support
add 36bc83f9 Adjust option order of test_package to be consistent with
that of Celix, add test_package for RSA.
add 6a9b6958 Turn off experimental CXX RSA by default.
add 7d8d355d Make usage of conan in test_package completely non-intrusive,
move test_package under examples, and add minimum documentation.
add 551ad166 Merge branch 'hotfix/array_list_equality' into conan_support
add 835dc251 Merge branch 'hotfix/array_list_equality' into conan_support
add 7e2d1995 Use old version range syntax to increase compatibility.
add 39db6edc Add missing DEPS.
add 08c590c2 Fix transitive private shared library dependency.
add e371b064 Revert "Fix transitive private shared library dependency."
add f35dcb58 Add back workaround of transitive private shared library
dependency issue.
add bddd7a26 Minor comment update.
add 02d49150 Following recommended approach of using FindThreads.
add 10267cfd Add virtualrunenv generator to facilitate integration with
CLion.
add e87ff2b4 Make clang sanitizer work with cpputest.
add 9e9d1442 Make clang sanitizer work with cpputest.
add d972839a Disable cpputest's build-in memory_leak_detection completely
when ASAN is enabled.
add c6581333 Remove unnecessary -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED,
and fix conan zeromq override warning.
add 9198422d Remove comments.
add 04df30ec Revert "Remove comments."
add a47432c8 Add code coverage support in conan, and eliminate gcc
warnings when using cpputest with build-in memory leak detector.
add 243d8548 Add missing -ldl
add bf5fd15c Updates conanfile.py and jansson linking for macos setup
add 1a275069 Updates wrong link target and update conan cmake configure if
no version is found
add c6b047e7 Reverts version handling in conanfile, applies undefined
linker setup for macos and fixes openssl version
add 7c68393a Add version to recipe, add executable linking workaround for
test_package.
new 4e70917e Merge pull request #401 from apache/feature/conan_support
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:
CMakeLists.txt | 55 +-
bundles/cxx_remote_services/CMakeLists.txt | 13 +-
.../cxx_remote_services/admin/gtest/CMakeLists.txt | 2 +-
.../discovery_configured/gtest/CMakeLists.txt | 2 +-
.../cxx_remote_services/integration/CMakeLists.txt | 81 +-
bundles/cxx_remote_services/rsa_spi/CMakeLists.txt | 6 +-
bundles/deployment_admin/CMakeLists.txt | 25 +-
bundles/device_access/CMakeLists.txt | 4 +-
bundles/device_access/device_access/CMakeLists.txt | 8 +-
bundles/device_access/example/CMakeLists.txt | 2 +-
bundles/http_admin/CMakeLists.txt | 2 +-
bundles/http_admin/civetweb/CMakeLists.txt | 9 +-
bundles/http_admin/http_admin_api/CMakeLists.txt | 6 +-
bundles/logging/CMakeLists.txt | 19 +-
bundles/logging/log_admin/gtest/CMakeLists.txt | 2 +-
bundles/logging/log_helper/CMakeLists.txt | 12 +-
bundles/logging/log_service_api/CMakeLists.txt | 10 +-
bundles/logging/log_writers/CMakeLists.txt | 2 +-
.../log_writers/syslog_writer/CMakeLists.txt | 2 +-
.../log_writers/syslog_writer/gtest/CMakeLists.txt | 3 +-
bundles/pubsub/CMakeLists.txt | 31 +-
bundles/pubsub/examples/CMakeLists.txt | 663 +++++++-------
bundles/pubsub/integration/CMakeLists.txt | 984 +++++++++++----------
bundles/pubsub/pubsub_admin_tcp/CMakeLists.txt | 49 +-
bundles/pubsub/pubsub_admin_udp_mc/CMakeLists.txt | 45 +-
.../pubsub/pubsub_admin_websocket/CMakeLists.txt | 47 +-
bundles/pubsub/pubsub_admin_zmq/CMakeLists.txt | 65 +-
bundles/pubsub/pubsub_api/CMakeLists.txt | 7 +-
bundles/pubsub/pubsub_discovery/CMakeLists.txt | 41 +-
.../pubsub_serializer_avrobin/gtest/CMakeLists.txt | 2 +-
.../pubsub/pubsub_serializer_json/CMakeLists.txt | 6 +-
.../pubsub_serializer_json/gtest/CMakeLists.txt | 2 +-
bundles/pubsub/pubsub_spi/CMakeLists.txt | 8 +-
bundles/pubsub/pubsub_utils/CMakeLists.txt | 6 +-
bundles/pubsub/pubsub_utils/gtest/CMakeLists.txt | 3 +-
bundles/remote_services/CMakeLists.txt | 17 +-
.../deprecated_rsa_spi/CMakeLists.txt | 6 +-
.../discovery_configured/CMakeLists.txt | 43 +-
.../remote_services/discovery_etcd/CMakeLists.txt | 57 +-
.../examples/interceptors/CMakeLists.txt | 2 +-
.../remote_service_admin_dfi/CMakeLists.txt | 66 +-
.../remote_service_admin_dfi/gtest/CMakeLists.txt | 10 +-
.../private/test/CMakeLists.txt | 2 +-
.../remote_services_api/CMakeLists.txt | 6 +-
bundles/remote_services/rsa_common/CMakeLists.txt | 2 +-
.../topology_manager/CMakeLists.txt | 11 +-
.../topology_manager/tms_tst/CMakeLists.txt | 6 +-
.../topology_manager/tms_tst/bundle/CMakeLists.txt | 3 +-
.../tms_tst/disc_mock/CMakeLists.txt | 3 +-
bundles/shell/remote_shell/CMakeLists.txt | 32 +-
bundles/shell/shell/CMakeLists.txt | 36 +-
bundles/shell/shell/gtest/CMakeLists.txt | 22 +-
bundles/shell/shell_bonjour/CMakeLists.txt | 6 +-
.../shell_bonjour/private/src/bonjour_shell.c | 2 +-
bundles/shell/shell_tui/CMakeLists.txt | 4 +-
bundles/shell/shell_wui/CMakeLists.txt | 2 -
cmake/CelixConfig.cmake | 54 +-
cmake/Modules/FindCppUTest.cmake | 14 +
cmake/Modules/FindJansson.cmake | 6 +-
cmake/Modules/FindLIBZIP.cmake | 2 +-
cmake/celix_project/CelixProject.cmake | 34 +-
cmake/celix_project/CodeCoverage.cmake | 2 +-
cmake/cmake_celix/BundlePackaging.cmake | 5 +-
cmake/cmake_celix/ContainerPackaging.cmake | 3 +-
cmake/cmake_celix/UseCelix.cmake | 37 -
conanfile.py | 255 ++++++
examples/CMakeLists.txt | 1 -
examples/celix-examples/CMakeLists.txt | 2 +-
examples/conan_test_package/CMakeLists.txt | 269 ++++++
examples/conan_test_package/README.md | 52 ++
examples/conan_test_package/conanfile.py | 106 +++
examples/conan_test_package/hello_bundle.c | 48 +
.../conan_test_package/my_log_writer_activator.c | 71 ++
examples/conan_test_package/my_psa_activator.c | 184 ++++
examples/conan_test_package/my_rsa_activator.c | 115 +++
examples/conan_test_package/test_cxx_shell.cpp | 84 ++
examples/conan_test_package/test_etcd_lib.c | 31 +
examples/conan_test_package/test_framework.c | 39 +
.../conan_test_package/test_http_admin_activator.c | 13 +-
examples/conan_test_package/test_promises.cpp | 32 +
examples/conan_test_package/test_pushstreams.cpp | 49 +
examples/conan_test_package/test_shell.c | 72 ++
libs/CMakeLists.txt | 4 +-
libs/dependency_manager/CMakeLists.txt | 5 +-
libs/dfi/CMakeLists.txt | 7 +-
libs/dfi/gtest/CMakeLists.txt | 2 +-
libs/etcdlib/CMakeLists.txt | 103 +--
libs/etcdlib/cmake/FindJansson.cmake | 19 +-
libs/framework/CMakeLists.txt | 9 +-
libs/launcher/CMakeLists.txt | 11 +-
libs/promises/CMakeLists.txt | 7 +-
libs/pushstreams/CMakeLists.txt | 8 +-
.../pushstreams/api/celix/impl/PushEventConsumer.h | 1 +
libs/utils/CMakeLists.txt | 26 +-
misc/experimental/CMakeLists.txt | 2 +-
.../config_admin/config_admin_tst/CMakeLists.txt | 2 +-
.../bundles/pubsub_admin_nanomsg/CMakeLists.txt | 1 -
97 files changed, 2898 insertions(+), 1451 deletions(-)
create mode 100644 conanfile.py
create mode 100644 examples/conan_test_package/CMakeLists.txt
create mode 100644 examples/conan_test_package/README.md
create mode 100644 examples/conan_test_package/conanfile.py
create mode 100644 examples/conan_test_package/hello_bundle.c
create mode 100644 examples/conan_test_package/my_log_writer_activator.c
create mode 100644 examples/conan_test_package/my_psa_activator.c
create mode 100644 examples/conan_test_package/my_rsa_activator.c
create mode 100644 examples/conan_test_package/test_cxx_shell.cpp
create mode 100644 examples/conan_test_package/test_etcd_lib.c
create mode 100644 examples/conan_test_package/test_framework.c
copy bundles/http_admin/gtest/src/sut_activator.c =>
examples/conan_test_package/test_http_admin_activator.c (89%)
create mode 100644 examples/conan_test_package/test_promises.cpp
create mode 100644 examples/conan_test_package/test_pushstreams.cpp
create mode 100644 examples/conan_test_package/test_shell.c
