Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ use_repo(python)
bazel_dep(name = "googletest", version = "1.17.0.bcr.1")
bazel_dep(name = "rapidjson", version = "1.1.0")
bazel_dep(name = "score_baselibs", version = "0.2.4")
git_override(
module_name = "score_baselibs",
commit = "4b67ce1929575801405c77f7e3c79ab36156a976",
remote = "https://github.com/eclipse-score/baselibs.git",
)

bazel_dep(name = "score_communication", version = "0.1.2")
git_override(
module_name = "score_communication",
Expand Down
31 changes: 27 additions & 4 deletions score/datarouter/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@

load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES")
load("@score_baselibs//score/quality/clang_tidy:extra_checks.bzl", "clang_tidy_extra_checks")

clang_tidy_extra_checks(
name = "clang_tidy_extra_checks",
extra_features = [
"spp_code_style_check_header_guards",
"spp_code_style_check_method_names",
"spp_code_style_check_readability",
"spp_code_style_check_type_names",
"spp_code_style_check_variable_names",
],
)

## ===========================================================================
## dltprotocol
Expand Down Expand Up @@ -45,6 +57,7 @@ cc_library(
"//score/mw/log/detail/common:log_entry_deserialize",
"@score_baselibs//score/language/futurecpp",
"@score_baselibs//score/os/utils:path",
"@score_baselibs//score/quality/compiler_warnings",
],
)

Expand All @@ -69,6 +82,7 @@ cc_library(
"@score_baselibs//score/language/futurecpp",
"@score_baselibs//score/os:socket",
"@score_baselibs//score/os/utils:signal",
"@score_baselibs//score/quality/compiler_warnings",
],
)

Expand Down Expand Up @@ -337,7 +351,7 @@ filegroup(
visibility = [
"//platform/aas/tools/itf:__subpackages__",
"//platform/aas/tools/sctf:__subpackages__",
"//pqr/abc/abc-lmn/config/iproject/corepas/datarouter:__pkg__",
"//pqr/abc/abc-lmn/config/project/cpu/pas/datarouter:__pkg__",
"//score/datarouter/test:__subpackages__",
],
)
Expand Down Expand Up @@ -510,7 +524,7 @@ cc_library(
"//conditions:default": ["//score/datarouter/src/persistency/stub_persistent_dictionary:stub_persistent_dictionary_factory"],
}) + select({
"//score/datarouter/build_configuration_flags:config_file_transfer": [
"//score/datarouter/src/file_transfer/file_transfer_impl:file_transfer_stream_handler",
ft_dep,
],
"//conditions:default": [
"//score/datarouter/src/file_transfer/file_transfer_stub:file_transfer_stream_handler_stub",
Expand Down Expand Up @@ -538,14 +552,15 @@ cc_library(
],
}),
)
for name, ara_fact_dep, nv_dep, nv_stub_dep, dc_dep, dc_stub_dep, test_only in [
for name, ara_fact_dep, nv_dep, nv_stub_dep, dc_dep, dc_stub_dep, ft_dep, test_only in [
(
"",
"//score/datarouter/src/persistency/ara_per_persistent_dictionary:ara_per_persistent_dictionary_factory",
"//score/datarouter/src/dlt/nonverbose_dlt_impl:nonverbose_dlt_handler",
"//score/datarouter/src/dlt/nonverbose_dlt_stub:nonverbose_dlt_handler_stub",
"//score/datarouter/src/configuration/dynamic_config/dynamic_config_impl:dynamic_config_session",
"//score/datarouter/src/configuration/dynamic_config/dynamic_config_stub:config_session_stub",
"//score/datarouter/src/file_transfer/file_transfer_impl:file_transfer_stream_handler",
False,
),
(
Expand All @@ -555,6 +570,7 @@ cc_library(
"//score/datarouter/src/dlt/nonverbose_dlt_stub:nonverbose_dlt_handler_stub_testing",
"//score/datarouter/src/configuration/dynamic_config/dynamic_config_impl:dynamic_config_session_testing",
"//score/datarouter/src/configuration/dynamic_config/dynamic_config_stub:config_session_stub_testing",
"//score/datarouter/src/file_transfer/file_transfer_impl:file_transfer_stream_handler_testing",
True,
),
]
Expand Down Expand Up @@ -591,6 +607,7 @@ cc_library(
":log_entry_deserialization",
":log_sender",
":logchannel_utility",
":udp_stream_output",
":unixdomain_server",
"//score/datarouter/network:vlan",
"//score/datarouter/src/persistent_logging/persistent_logging_stub:sysedr_stub",
Expand Down Expand Up @@ -753,6 +770,7 @@ cc_library(
hdrs = [
"include/daemon/socketserver.h",
],
# Configuration block updated during migration
features = COMPILER_WARNING_FEATURES,
local_defines = select({
"//score/datarouter/build_configuration_flags:config_persistent_logging": ["PERSISTENT_LOGGING"],
Expand Down Expand Up @@ -787,6 +805,7 @@ cc_library(
hdrs = [
"include/daemon/socketserver.h",
],
# Configuration block updated during migration
features = COMPILER_WARNING_FEATURES,
local_defines = select({
"//score/datarouter/build_configuration_flags:config_persistent_logging": ["PERSISTENT_LOGGING"],
Expand Down Expand Up @@ -922,10 +941,14 @@ cc_library(
],
features = COMPILER_WARNING_FEATURES,
strip_include_prefix = "mocks",
visibility = ["//score/datarouter/test:__subpackages__"],
visibility = [
"//score/datarouter/src/file_transfer:__subpackages__",
"//score/datarouter/test:__subpackages__",
],
deps = [
":dltserver_common",
"@googletest//:gtest_main",
"@score_baselibs//score/os:socket",
],
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

#ifndef SCORE_PAS_LOGGING_DAEMON_COMMUNICATION_SESION_HANDLE_INTERFACE_H_
#define SCORE_PAS_LOGGING_DAEMON_COMMUNICATION_SESION_HANDLE_INTERFACE_H_
#ifndef SCORE_DATAROUTER_DAEMON_COMMUNICATION_SESSION_HANDLE_INTERFACE_H
#define SCORE_DATAROUTER_DAEMON_COMMUNICATION_SESSION_HANDLE_INTERFACE_H

namespace score
{
Expand All @@ -35,4 +35,4 @@ class ISessionHandle
} // namespace platform
} // namespace score

#endif // SCORE_PAS_LOGGING_DAEMON_COMMUNICATION_SESION_HANDLE_INTERFACE_H_
#endif // SCORE_DATAROUTER_DAEMON_COMMUNICATION_SESSION_HANDLE_INTERFACE_H
6 changes: 3 additions & 3 deletions score/datarouter/daemon_communication/session_handle_mock.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

#ifndef SCORE_PAS_LOGGING_DAEMON_COMMUNICATION_SESION_HANDLE_MOCK_H_
#define SCORE_PAS_LOGGING_DAEMON_COMMUNICATION_SESION_HANDLE_MOCK_H_
#ifndef SCORE_DATAROUTER_DAEMON_COMMUNICATION_SESION_HANDLE_MOCK_H
#define SCORE_DATAROUTER_DAEMON_COMMUNICATION_SESION_HANDLE_MOCK_H

#include "score/datarouter/daemon_communication/session_handle_interface.h"

Expand All @@ -29,4 +29,4 @@ class SessionHandleMock : public score::platform::internal::daemon::ISessionHand

} // namespace score::platform::internal::daemon::mock

#endif // SCORE_PAS_LOGGING_DAEMON_COMMUNICATION_SESION_HANDLE_MOCK_H_
#endif // SCORE_DATAROUTER_DAEMON_COMMUNICATION_SESION_HANDLE_MOCK_H
Loading