mini-adas: mw com api support

.bazelrc

@@ -39,3 +39,9 @@ build:lint --@aspect_rules_lint//lint:fail_on_violation=true
 build:lint-rust --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
 build:lint-rust --output_groups=+clippy_checks
 build:lint-rust --@rules_rust//:clippy.toml=//:clippy.toml
+
+# Communication integration
+common --@score_logging//score/mw/log/flags:KRemote_Logging=False
+common --@score_baselibs//score/json:base_library=nlohmann
+common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
+common --@score_communication//score/mw/com/flags:tracing_library=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation

MODULE.bazel

@@ -35,6 +35,47 @@ git_override(
     remote = "https://github.com/eclipse-score/baselibs_rust.git",
 )
 
+# SCORE communication integration
+bazel_dep(name = "score_communication", version = "0.1.2")
+#bazel_dep(name = "rules_doxygen", version = "2.6.1", dev_dependency = True)
+
+git_override(
+    module_name = "score_communication",
+    commit = "dfc9b0f6fd2ae43cecdf11f4684ee2aa628faaf5",
+    remote = "https://github.com/eclipse-score/communication.git",
+)
+
+bazel_dep(name = "score_baselibs", version = "0.2.2")
+git_override(
+    module_name = "score_baselibs",
+    commit = "6951cd2a3045fb7a053acf203833a17704c22ccf",
+    remote = "https://github.com/eclipse-score/baselibs.git",
+)
+
+## TRLC dependency for requirements traceability
+bazel_dep(name = "trlc", version = "0.0.0", dev_dependency = True)
+git_override(
+    module_name = "trlc",
+    commit = "a4f7e95210d8093ba208b91cbc5b681eae8d502b",  # trlc-2.0.3 release
+    remote = "https://github.com/bmw-software-engineering/trlc.git",
+)
+
+bazel_dep(name = "score_logging", version = "0.0.5")
+
+single_version_override(
+    module_name = "score_docs_as_code",
+    version = "3.0.0",
+)
+
+bazel_dep(name = "rules_boost", repo_name = "com_github_nelhage_rules_boost")
+archive_override(
+    module_name = "rules_boost",
+    strip_prefix = "rules_boost-master",
+    urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
+)
+
+bazel_dep(name = "boost.program_options", version = "1.87.0")
+
 # Rust rules for Bazel
 bazel_dep(name = "rules_rust", version = "0.68.1-score")
 bazel_dep(name = "rules_rust_prost", version = "0.67.0")

examples/rust/mini-adas/BUILD.bazel

@@ -17,10 +17,8 @@ rust_library(
     name = "libmini_adas_rust",
     srcs = [
         "src/activities/components.rs",
-        "src/activities/messages.rs",
         "src/activities/mod.rs",
         "src/config.rs",
-        "src/ffi.rs",
         "src/lib.rs",
     ],
     crate_features = [
@@ -33,13 +31,14 @@ rust_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        ":cpp_activities",
+        "//examples/rust/mini-adas/mini-adas-gen:mini_adas_gen_rs",
         "//src/feo:libfeo_rust",
         "//src/feo-com:libfeo_com_rust",
         "//src/feo-cpp-build:libfeo_cpp_build_rust",
         "//src/feo-time:libfeo_time_rust",
         "//src/feo-tracing:libfeo_tracing_rust",
         "@score_baselibs_rust//src/log/score_log",
+        "@score_communication//score/mw/com/impl/rust/com-api/com-api",
         "@score_crates//:tracing",
     ],
 )
@@ -48,10 +47,8 @@ rust_library(
     name = "libmini_adas_recording_rust",
     srcs = [
         "src/activities/components.rs",
-        "src/activities/messages.rs",
         "src/activities/mod.rs",
         "src/config.rs",
-        "src/ffi.rs",
         "src/lib.rs",
     ],
     crate_features = [
@@ -65,13 +62,14 @@ rust_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        ":cpp_activities",
+        "//examples/rust/mini-adas/mini-adas-gen:mini_adas_gen_rs",
         "//src/feo:libfeo_recording_rust",
         "//src/feo-com:libfeo_com_rust",
         "//src/feo-cpp-build:libfeo_cpp_build_rust",
         "//src/feo-time:libfeo_time_rust",
         "//src/feo-tracing:libfeo_tracing_rust",
         "@score_baselibs_rust//src/log/score_log",
+        "@score_communication//score/mw/com/impl/rust/com-api/com-api",
         "@score_crates//:postcard",
         "@score_crates//:serde",
         "@score_crates//:tracing",
@@ -84,6 +82,13 @@ rust_binary(
         "src/bin/adas_primary.rs",
     ],
     crate_features = ["signalling_relayed_tcp"],
+    data = [
+        "etc/logging.json",
+        "etc/mw_com_config.json",
+    ],
+    env = {
+        "MW_LOG_CONFIG_FILE": "examples/rust/mini-adas/etc/logging.json",
+    },
     rustc_flags = [
         "-Clink-arg=-lstdc++",
         "-Clink-arg=-lm",
@@ -97,6 +102,7 @@ rust_binary(
         "//src/feo-tracing:libfeo_tracing_rust",
         "@score_baselibs_rust//src/log/score_log",
         "@score_baselibs_rust//src/log/stdout_logger",
+        "@score_communication//score/mw/com/impl/rust/com-api/com-api",
     ],
 )
 
@@ -106,6 +112,13 @@ rust_binary(
         "src/bin/adas_secondary.rs",
     ],
     crate_features = ["signalling_relayed_tcp"],
+    data = [
+        "etc/logging.json",
+        "etc/mw_com_config.json",
+    ],
+    env = {
+        "MW_LOG_CONFIG_FILE": "examples/rust/mini-adas/etc/logging.json",
+    },
     rustc_flags = [
         "-Clink-arg=-lstdc++",
         "-Clink-arg=-lm",
@@ -119,44 +132,7 @@ rust_binary(
         "//src/feo-tracing:libfeo_tracing_rust",
         "@score_baselibs_rust//src/log/score_log",
         "@score_baselibs_rust//src/log/stdout_logger",
-    ],
-)
-
-rust_binary(
-    name = "adas_recorder",
-    srcs = [
-        "src/bin/adas_recorder.rs",
-    ],
-    crate_features = [
-        "recording",
-        "signalling_direct_tcp",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":libmini_adas_recording_rust",
-        "//src/feo:libfeo_recording_rust",
-        "//src/feo-time:libfeo_time_rust",
-        "//src/feo-tracing:libfeo_tracing_rust",
-        "@score_baselibs_rust//src/log/score_log",
-        "@score_baselibs_rust//src/log/stdout_logger",
-    ],
-)
-
-rust_binary(
-    name = "adas_deserializer",
-    srcs = [
-        "src/bin/adas_deserializer.rs",
-    ],
-    crate_features = ["recording"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":libmini_adas_recording_rust",
-        "//src/feo:libfeo_recording_rust",
-        "//src/feo-tracing:libfeo_tracing_rust",
-        "@score_baselibs_rust//src/log/score_log",
-        "@score_baselibs_rust//src/log/stdout_logger",
-        "@score_crates//:postcard",
-        "@score_crates//:serde",
+        "@score_communication//score/mw/com/impl/rust/com-api/com-api",
     ],
 )
 

examples/rust/mini-adas/build.rs

@@ -17,15 +17,4 @@ use std::path::PathBuf;
 // Relative path to the feo repository root directory
 static PATH_TO_REPO_ROOT: &str = "../../../";
 
-fn main() {
-    let sources = ["src/cpp/lane_assist.cpp", "src/cpp/trajec_vis.cpp"];
-    let header_dirs = ["src/include/"];
-
-    println!("cargo::rerun-if-changed=build.rs");
-
-    let local_dir: PathBuf = env::var("CARGO_MANIFEST_DIR").unwrap().into();
-    let repo_root_dir = local_dir.join(PATH_TO_REPO_ROOT);
-
-    // Build given components into the given library
-    feo_cpp_build::activity_lib(&sources, &header_dirs, "cpp_activities", repo_root_dir);
-}
+fn main() {}

examples/rust/mini-adas/etc/logging.json

@@ -0,0 +1,8 @@
+{
+  "ecuId": "Rust",
+  "appId": "miniadas",
+  "appDesc": "mini-adas",
+  "logLevel": "kDebug",
+  "logMode": "kFile",
+  "logFilePath": "/tmp"
+}