This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch feature/509-remove-avpr in repository https://gitbox.apache.org/repos/asf/celix.git
commit 78590b8f48fcd6d88661dfbe781e4a54dbad1a0f Author: PengZheng <[email protected]> AuthorDate: Tue Dec 12 14:26:16 2023 +0800 Remove celix_pubsub_serializer_avrobin. --- bundles/pubsub/CMakeLists.txt | 1 - .../pubsub_serializer_avrobin/CMakeLists.txt | 46 -------- .../pubsub_serializer_avrobin/gtest/CMakeLists.txt | 36 ------- .../gtest/msg_descriptors/msg_poi1.descriptor | 10 -- .../PubSubAvrobinSerializationProviderTestSuite.cc | 110 ------------------- .../src/ps_avrobin_serializer_activator.c | 40 ------- .../src/pubsub_avrobin_serialization_provider.c | 120 --------------------- .../src/pubsub_avrobin_serialization_provider.h | 40 ------- conanfile.py | 3 +- examples/conan_test_package/CMakeLists.txt | 5 - examples/conan_test_package/conanfile.py | 4 - examples/conan_test_package_v2/conanfile.py | 4 - 12 files changed, 1 insertion(+), 418 deletions(-) diff --git a/bundles/pubsub/CMakeLists.txt b/bundles/pubsub/CMakeLists.txt index 11513943..92214cf6 100644 --- a/bundles/pubsub/CMakeLists.txt +++ b/bundles/pubsub/CMakeLists.txt @@ -26,7 +26,6 @@ if (PUBSUB) add_subdirectory(pubsub_admin_websocket) add_subdirectory(pubsub_discovery) add_subdirectory(pubsub_serializer_json) - add_subdirectory(pubsub_serializer_avrobin) add_subdirectory(pubsub_protocol) add_subdirectory(keygen) add_subdirectory(examples) diff --git a/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt deleted file mode 100644 index 57ca752a..00000000 --- a/bundles/pubsub/pubsub_serializer_avrobin/CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -celix_subproject(PUBSUB_AVROBIN_SERIALIZER "Option to enable building the Avro binary serializer bundle" ON) -if (PUBSUB_AVROBIN_SERIALIZER) - find_package(jansson REQUIRED) - - add_celix_bundle(celix_pubsub_serializer_avrobin - BUNDLE_SYMBOLICNAME "apache_celix_pubsub_serializer_avrobin" - VERSION "1.1.1" - GROUP "Celix/PubSub" - SOURCES - src/ps_avrobin_serializer_activator.c - src/pubsub_avrobin_serialization_provider.c - ) - target_include_directories(celix_pubsub_serializer_avrobin PRIVATE - src - ${JANSSON_INCLUDE_DIR} - ) - target_link_libraries(celix_pubsub_serializer_avrobin PRIVATE Celix::dfi jansson::jansson Celix::log_helper) - target_link_libraries(celix_pubsub_serializer_avrobin PRIVATE Celix::pubsub_spi Celix::pubsub_utils ) - celix_deprecated_utils_headers(celix_pubsub_serializer_avrobin) - celix_deprecated_framework_headers(celix_pubsub_serializer_avrobin) - - install_celix_bundle(celix_pubsub_serializer_avrobin EXPORT celix COMPONENT pubsub) - - add_library(Celix::celix_pubsub_serializer_avrobin ALIAS celix_pubsub_serializer_avrobin) - - if (ENABLE_TESTING) - add_subdirectory(gtest) - endif(ENABLE_TESTING) -endif () \ No newline at end of file diff --git a/bundles/pubsub/pubsub_serializer_avrobin/gtest/CMakeLists.txt b/bundles/pubsub/pubsub_serializer_avrobin/gtest/CMakeLists.txt deleted file mode 100644 index b28e01e4..00000000 --- a/bundles/pubsub/pubsub_serializer_avrobin/gtest/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -add_celix_bundle(pubsub_avrobin_serialization_descriptor NO_ACTIVATOR VERSION 1.0.0) -celix_bundle_files(pubsub_avrobin_serialization_descriptor - ${CMAKE_CURRENT_SOURCE_DIR}/msg_descriptors/msg_poi1.descriptor - DESTINATION "META-INF/descriptors" -) - -add_executable(test_pubsub_serializer_avrobin - src/PubSubAvrobinSerializationProviderTestSuite.cc -) -celix_deprecated_utils_headers(test_pubsub_serializer_avrobin) -target_link_libraries(test_pubsub_serializer_avrobin PRIVATE Celix::framework Celix::dfi Celix::pubsub_utils GTest::gtest GTest::gtest_main Celix::pubsub_spi) - -add_celix_bundle_dependencies(test_pubsub_serializer_avrobin celix_pubsub_serializer_avrobin pubsub_avrobin_serialization_descriptor) -target_compile_definitions(test_pubsub_serializer_avrobin PRIVATE -DSERIALIZATION_BUNDLE=\"$<TARGET_PROPERTY:celix_pubsub_serializer_avrobin,BUNDLE_FILE>\") -target_compile_definitions(test_pubsub_serializer_avrobin PRIVATE -DDESCRIPTOR_BUNDLE=\"$<TARGET_PROPERTY:pubsub_avrobin_serialization_descriptor,BUNDLE_FILE>\") - -add_test(NAME test_pubsub_serializer_avrobin COMMAND test_pubsub_serializer_avrobin) -setup_target_for_coverage(test_pubsub_serializer_avrobin SCAN_DIR ..) - diff --git a/bundles/pubsub/pubsub_serializer_avrobin/gtest/msg_descriptors/msg_poi1.descriptor b/bundles/pubsub/pubsub_serializer_avrobin/gtest/msg_descriptors/msg_poi1.descriptor deleted file mode 100644 index 705cf296..00000000 --- a/bundles/pubsub/pubsub_serializer_avrobin/gtest/msg_descriptors/msg_poi1.descriptor +++ /dev/null @@ -1,10 +0,0 @@ -:header -type=message -name=poi1 -version=1.0.0 -:annotations -classname=org.example.PointOfInterest -:types -location={DD lat lon} -:message -{llocation;t location name} \ No newline at end of file diff --git a/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc b/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc deleted file mode 100644 index c52be9d8..00000000 --- a/bundles/pubsub/pubsub_serializer_avrobin/gtest/src/PubSubAvrobinSerializationProviderTestSuite.cc +++ /dev/null @@ -1,110 +0,0 @@ -/** - *Licensed to the Apache Software Foundation (ASF) under one - *or more contributor license agreements. See the NOTICE file - *distributed with this work for additional information - *regarding copyright ownership. The ASF licenses this file - *to you under the Apache License, Version 2.0 (the - *"License"); you may not use this file except in compliance - *with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, - *software distributed under the License is distributed on an - *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - *specific language governing permissions and limitations - *under the License. - */ - -#include "gtest/gtest.h" - -#include <memory> - -#include "celix_constants.h" -#include "celix_framework_factory.h" -#include "celix_bundle_context.h" -#include "pubsub_message_serialization_service.h" - -class PubSubAvrobinSerializationProviderTestSuite : public ::testing::Test { -public: - PubSubAvrobinSerializationProviderTestSuite() { - auto* props = celix_properties_create(); - celix_properties_set(props, CELIX_FRAMEWORK_CACHE_DIR, ".pubsub_avrobin_serializer_cache"); - auto* fwPtr = celix_frameworkFactory_createFramework(props); - auto* ctxPtr = celix_framework_getFrameworkContext(fwPtr); - fw = std::shared_ptr<celix_framework_t>{fwPtr, [](auto* f) {celix_frameworkFactory_destroyFramework(f);}}; - ctx = std::shared_ptr<celix_bundle_context_t>{ctxPtr, [](auto*){/*nop*/}}; - - const char* descBundleFile = DESCRIPTOR_BUNDLE; - const char* serBundleFile = SERIALIZATION_BUNDLE; - long bndId; - - bndId = celix_bundleContext_installBundle(ctx.get(), descBundleFile, true); - EXPECT_TRUE(bndId >= 0); - - bndId = celix_bundleContext_installBundle(ctx.get(), serBundleFile, true); - EXPECT_TRUE(bndId >= 0); - } - - std::shared_ptr<celix_framework_t> fw{}; - std::shared_ptr<celix_bundle_context_t> ctx{}; -}; - - -TEST_F(PubSubAvrobinSerializationProviderTestSuite, CreateDestroy) { - //checks if the bundles are started and stopped correctly (no mem leaks). -} - -TEST_F(PubSubAvrobinSerializationProviderTestSuite, FindSerializationServices) { - auto* services = celix_bundleContext_findServices(ctx.get(), PUBSUB_MESSAGE_SERIALIZATION_SERVICE_NAME); - EXPECT_EQ(1, celix_arrayList_size(services)); //3 valid, 5 invalid - celix_arrayList_destroy(services); -} - -TEST_F(PubSubAvrobinSerializationProviderTestSuite, SerializeAndDeserializeTest) { - struct poi1 { - struct { - double lat; - double lon; - } location; - const char *name; - }; - - struct data { - poi1* input; - poi1* output; - }; - - poi1 input; - input.location.lat = 42; - input.location.lon = 43; - input.name = "test"; - - poi1 output; - memset(&output, 0, sizeof(output)); - - data dataHandle; - dataHandle.input = &input; - dataHandle.output = &output; - - celix_service_use_options_t opts{}; - opts.filter.serviceName = PUBSUB_MESSAGE_SERIALIZATION_SERVICE_NAME; - opts.filter.filter = "(msg.fqn=poi1)"; - opts.callbackHandle = static_cast<void*>(&dataHandle); - opts.use = [](void *handle, void *svc) { - auto *dh = static_cast<data*>(handle); - auto* ser = static_cast<pubsub_message_serialization_service_t*>(svc); - struct iovec* serVec; - size_t serSize; - ser->serialize(ser->handle, dh->input, &serVec, &serSize); - ser->deserialize(ser->handle, serVec, serSize, (void**)(&dh->output)); - - EXPECT_EQ(42, dh->output->location.lat); - - ser->freeSerializedMsg(ser->handle, serVec, serSize); - ser->freeDeserializedMsg(ser->handle, dh->output); - }; - bool called = celix_bundleContext_useServiceWithOptions(ctx.get(), &opts); - EXPECT_TRUE(called); -} diff --git a/bundles/pubsub/pubsub_serializer_avrobin/src/ps_avrobin_serializer_activator.c b/bundles/pubsub/pubsub_serializer_avrobin/src/ps_avrobin_serializer_activator.c deleted file mode 100644 index d6034350..00000000 --- a/bundles/pubsub/pubsub_serializer_avrobin/src/ps_avrobin_serializer_activator.c +++ /dev/null @@ -1,40 +0,0 @@ -/** - *Licensed to the Apache Software Foundation (ASF) under one - *or more contributor license agreements. See the NOTICE file - *distributed with this work for additional information - *regarding copyright ownership. The ASF licenses this file - *to you under the Apache License, Version 2.0 (the - *"License"); you may not use this file except in compliance - *with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, - *software distributed under the License is distributed on an - *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - *specific language governing permissions and limitations - *under the License. - */ - -#include <stdlib.h> -#include <pubsub_constants.h> - -#include "celix_api.h" -#include "pubsub_avrobin_serialization_provider.h" - -typedef struct psav_activator { - pubsub_serialization_provider_t* avrobinSerializationProvider; -} psav_activator_t; - -static int psav_start(psav_activator_t *act, celix_bundle_context_t *ctx) { - act->avrobinSerializationProvider = pubsub_avrobinSerializationProvider_create(ctx); - return act->avrobinSerializationProvider ? CELIX_SUCCESS : CELIX_BUNDLE_EXCEPTION; -} - -static int psav_stop(psav_activator_t *act, celix_bundle_context_t *ctx) { - pubsub_avrobinSerializationProvider_destroy(act->avrobinSerializationProvider); - return CELIX_SUCCESS; -} - -CELIX_GEN_BUNDLE_ACTIVATOR(psav_activator_t, psav_start, psav_stop) diff --git a/bundles/pubsub/pubsub_serializer_avrobin/src/pubsub_avrobin_serialization_provider.c b/bundles/pubsub/pubsub_serializer_avrobin/src/pubsub_avrobin_serialization_provider.c deleted file mode 100644 index 20086138..00000000 --- a/bundles/pubsub/pubsub_serializer_avrobin/src/pubsub_avrobin_serialization_provider.c +++ /dev/null @@ -1,120 +0,0 @@ -/** - *Licensed to the Apache Software Foundation (ASF) under one - *or more contributor license agreements. See the NOTICE file - *distributed with this work for additional information - *regarding copyright ownership. The ASF licenses this file - *to you under the Apache License, Version 2.0 (the - *"License"); you may not use this file except in compliance - *with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, - *software distributed under the License is distributed on an - *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - *specific language governing permissions and limitations - *under the License. - */ - -#include "pubsub_avrobin_serialization_provider.h" - -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <assert.h> - -#include "avrobin_serializer.h" -#include "dyn_message.h" -#include "celix_log_helper.h" -#include "pubsub_message_serialization_service.h" - -static void dfi_log(void *handle, int level, const char *file, int line, const char *msg, ...) { - va_list ap; - celix_log_helper_t *log = handle; - char *logStr = NULL; - va_start(ap, msg); - vasprintf(&logStr, msg, ap); - va_end(ap); - celix_logHelper_log(log, level, "FILE:%s, LINE:%i, MSG:%s", file, line, logStr); - free(logStr); -} - - -static celix_status_t pubsub_avrobinSerializationProvider_serialize(pubsub_serialization_entry_t* entry, const void* msg, struct iovec** output, size_t* outputIovLen) { - celix_status_t status = CELIX_SUCCESS; - - if (output != NULL) { - *output = calloc(1, sizeof(struct iovec)); - *outputIovLen = 1; - } else { - return CELIX_ILLEGAL_ARGUMENT; - } - - uint8_t *serializedOutput = NULL; - size_t serializedOutputLen; - dyn_type* dynType; - dynMessage_getMessageType(entry->msgType, &dynType); - - if (avrobinSerializer_serialize(dynType, msg, &serializedOutput, &serializedOutputLen) != 0) { - status = CELIX_BUNDLE_EXCEPTION; - } - - if (status == CELIX_SUCCESS) { - (**output).iov_base = (void*)serializedOutput; - (**output).iov_len = serializedOutputLen; - } - - return status; -} - -void pubsub_avrobinSerializationProvider_freeSerializeMsg(pubsub_serialization_entry_t* entry, struct iovec* input, size_t inputIovLen) { - if (input != NULL) { - if (entry->msgType != NULL) { - for (int i = 0; i < inputIovLen; i++) { - if (input[i].iov_base) { - free(input[i].iov_base); - } - input[i].iov_base = NULL; - input[i].iov_len = 0; - } - } - free(input); - } -} - -celix_status_t pubsub_avrobinSerializationProvider_deserialize(pubsub_serialization_entry_t* entry, const struct iovec* input, size_t inputIovLen, void **out) { - celix_status_t status = CELIX_SUCCESS; - if (input == NULL) return CELIX_BUNDLE_EXCEPTION; - void *msg = NULL; - dyn_type* dynType; - dynMessage_getMessageType(entry->msgType, &dynType); - - assert(inputIovLen == 1); - - if (avrobinSerializer_deserialize(dynType, (uint8_t *)input->iov_base, input->iov_len, &msg) != 0) { - status = CELIX_BUNDLE_EXCEPTION; - } else{ - *out = msg; - } - - return status; -} - -void pubsub_avrobinSerializationProvider_freeDeserializeMsg(pubsub_serialization_entry_t* entry, void *msg) { - if (entry->msgType != NULL) { - dyn_type* dynType; - dynMessage_getMessageType(entry->msgType, &dynType); - dynType_free(dynType, msg); - } -} - -pubsub_serialization_provider_t* pubsub_avrobinSerializationProvider_create(celix_bundle_context_t* ctx) { - pubsub_serialization_provider_t* provider = pubsub_serializationProvider_create(ctx, "avrobin", false, 0, pubsub_avrobinSerializationProvider_serialize, pubsub_avrobinSerializationProvider_freeSerializeMsg, pubsub_avrobinSerializationProvider_deserialize, pubsub_avrobinSerializationProvider_freeDeserializeMsg); - avrobinSerializer_logSetup(dfi_log, pubsub_serializationProvider_getLogHelper(provider), 1); - return provider; -} - -void pubsub_avrobinSerializationProvider_destroy(pubsub_serialization_provider_t* provider) { - pubsub_serializationProvider_destroy(provider); -} \ No newline at end of file diff --git a/bundles/pubsub/pubsub_serializer_avrobin/src/pubsub_avrobin_serialization_provider.h b/bundles/pubsub/pubsub_serializer_avrobin/src/pubsub_avrobin_serialization_provider.h deleted file mode 100644 index b8ed98aa..00000000 --- a/bundles/pubsub/pubsub_serializer_avrobin/src/pubsub_avrobin_serialization_provider.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - *Licensed to the Apache Software Foundation (ASF) under one - *or more contributor license agreements. See the NOTICE file - *distributed with this work for additional information - *regarding copyright ownership. The ASF licenses this file - *to you under the Apache License, Version 2.0 (the - *"License"); you may not use this file except in compliance - *with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *Unless required by applicable law or agreed to in writing, - *software distributed under the License is distributed on an - *"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - *specific language governing permissions and limitations - *under the License. - */ - -#ifndef CELIX_PUBSUB_AVROBIN_SERIALIZATION_PROVIDER_H -#define CELIX_PUBSUB_AVROBIN_SERIALIZATION_PROVIDER_H - -#include "pubsub_serialization_provider.h" - -#ifdef __cplusplus -extern "C" { -#endif - -pubsub_serialization_provider_t* pubsub_avrobinSerializationProvider_create(celix_bundle_context_t *ctx); - -/** - * Destroys the provided AVRO-bin Serialization Provider. - */ -void pubsub_avrobinSerializationProvider_destroy(pubsub_serialization_provider_t *provider); - -#ifdef __cplusplus -}; -#endif - -#endif //CELIX_PUBSUB_AVROBIN_SERIALIZATION_PROVIDER_H diff --git a/conanfile.py b/conanfile.py index 644b2799..66a7c8f7 100644 --- a/conanfile.py +++ b/conanfile.py @@ -57,7 +57,6 @@ class CelixConan(ConanFile): "build_pubsub_wire_protocol_v1": False, "build_pubsub_wire_protocol_v2": False, "build_pubsub_json_serializer": False, - "build_pubsub_avrobin_serializer": False, "build_pubsub_psa_zmq": False, "build_pubsub_examples": False, "build_pubsub_integration": False, @@ -234,7 +233,7 @@ class CelixConan(ConanFile): if options["build_pubsub_wire_protocol_v2"]: options["build_pubsub"] = True - if options["build_pubsub_json_serializer"] or options["build_pubsub_avrobin_serializer"]: + if options["build_pubsub_json_serializer"]: options["build_pubsub"] = True if options["build_pubsub"]: diff --git a/examples/conan_test_package/CMakeLists.txt b/examples/conan_test_package/CMakeLists.txt index 13132c31..bc3180d7 100644 --- a/examples/conan_test_package/CMakeLists.txt +++ b/examples/conan_test_package/CMakeLists.txt @@ -359,11 +359,6 @@ if (TEST_PUBSUB_JSON_SERIALIZER) add_celix_container("use_pubsub_json_serializer" BUNDLES Celix::celix_pubsub_serializer_json hello) endif () -option(TEST_PUBSUB_AVROBIN_SERIALIZER "Test pubsub avrobin serializer" OFF) -if (TEST_PUBSUB_AVROBIN_SERIALIZER) - add_celix_container("use_pubsub_avrobin_serializer" BUNDLES Celix::celix_pubsub_serializer_avrobin hello) -endif () - option(TEST_CXX_REMOTE_SERVICE_ADMIN "Test C++ remote service admin" OFF) if (TEST_CXX_REMOTE_SERVICE_ADMIN) add_celix_container("use_cxx_remote_service_admin" BUNDLES Celix::RemoteServiceAdmin hello) diff --git a/examples/conan_test_package/conanfile.py b/examples/conan_test_package/conanfile.py index d802dc19..8cdca8a5 100644 --- a/examples/conan_test_package/conanfile.py +++ b/examples/conan_test_package/conanfile.py @@ -57,7 +57,6 @@ class TestPackageConan(ConanFile): cmake.definitions["TEST_PUBSUB_WIRE_PROTOCOL_V1"] = self.options["celix"].build_pubsub_wire_protocol_v1 cmake.definitions["TEST_PUBSUB_WIRE_PROTOCOL_V2"] = self.options["celix"].build_pubsub_wire_protocol_v2 cmake.definitions["TEST_PUBSUB_JSON_SERIALIZER"] = self.options["celix"].build_pubsub_json_serializer - cmake.definitions["TEST_PUBSUB_AVROBIN_SERIALIZER"] = self.options["celix"].build_pubsub_avrobin_serializer cmake.definitions["TEST_CXX_REMOTE_SERVICE_ADMIN"] = self.options["celix"].build_cxx_remote_service_admin cmake.definitions["TEST_SHELL_API"] = self.options["celix"].build_shell_api cmake.definitions["TEST_CELIX_DFI"] = self.options["celix"].build_celix_dfi @@ -140,9 +139,6 @@ class TestPackageConan(ConanFile): if self.options["celix"].build_pubsub_json_serializer: self.run("./use_pubsub_json_serializer", cwd=os.path.join("deploy", "use_pubsub_json_serializer"), run_environment=True) - if self.options["celix"].build_pubsub_avrobin_serializer: - self.run("./use_pubsub_avrobin_serializer", - cwd=os.path.join("deploy", "use_pubsub_avrobin_serializer"), run_environment=True) if self.options["celix"].build_cxx_remote_service_admin: self.run("./use_cxx_remote_service_admin", cwd=os.path.join("deploy", "use_cxx_remote_service_admin"), run_environment=True) diff --git a/examples/conan_test_package_v2/conanfile.py b/examples/conan_test_package_v2/conanfile.py index 06feadcc..e7e8a948 100644 --- a/examples/conan_test_package_v2/conanfile.py +++ b/examples/conan_test_package_v2/conanfile.py @@ -67,7 +67,6 @@ class TestPackageConan(ConanFile): tc.cache_variables["TEST_PUBSUB_WIRE_PROTOCOL_V1"] = celix_options.build_pubsub_wire_protocol_v1 tc.cache_variables["TEST_PUBSUB_WIRE_PROTOCOL_V2"] = celix_options.build_pubsub_wire_protocol_v2 tc.cache_variables["TEST_PUBSUB_JSON_SERIALIZER"] = celix_options.build_pubsub_json_serializer - tc.cache_variables["TEST_PUBSUB_AVROBIN_SERIALIZER"] = celix_options.build_pubsub_avrobin_serializer tc.cache_variables["TEST_CXX_REMOTE_SERVICE_ADMIN"] = celix_options.build_cxx_remote_service_admin tc.cache_variables["TEST_SHELL_API"] = celix_options.build_shell_api tc.cache_variables["TEST_CELIX_DFI"] = celix_options.build_celix_dfi @@ -156,9 +155,6 @@ class TestPackageConan(ConanFile): if celix_options.build_pubsub_json_serializer: self.run("./use_pubsub_json_serializer", cwd=os.path.join("deploy", "use_pubsub_json_serializer"), env="conanrun") - if celix_options.build_pubsub_avrobin_serializer: - self.run("./use_pubsub_avrobin_serializer", - cwd=os.path.join("deploy", "use_pubsub_avrobin_serializer"), env="conanrun") if celix_options.build_cxx_remote_service_admin: self.run("./use_cxx_remote_service_admin", cwd=os.path.join("deploy", "use_cxx_remote_service_admin"), env="conanrun")
