Merge pull request #104 from qorix-group/arkjedrz_fix-logging-build

repo: fix `logging` build issues

Author: ramceb

.bazelrc

@@ -22,7 +22,7 @@ build --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py
 
 # Common test flags for all platforms
 test --test_output=errors
-test --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
+test --@score_logging//score/mw/log/flags:KRemote_Logging=False
 test --@score_baselibs//score/json:base_library=nlohmann
 test --cxxopt=-Wno-deprecated-declarations
 
@@ -36,7 +36,7 @@ build:toolchain_common --incompatible_strict_action_env
 build:toolchain_common --host_platform=@score_bazel_platforms//:x86_64-linux
 ## Ferrocene must be common compiler for HOST. To ensure metadata compatibility for proc macro crate
 build:toolchain_common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
-build:stub --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
+build:stub --@score_logging//score/mw/log/flags:KRemote_Logging=False
 build:stub --@score_baselibs//score/json:base_library=nlohmann
 
 # Target configuration for CPU:x86-64|OS:Linux build (do not use it in case of system toolchains!)

MODULE.bazel

@@ -128,6 +128,15 @@ use_repo(pip, "pip_score_venv_test")
 
 bazel_dep(name = "score_baselibs_rust", version = "0.1.0")
 bazel_dep(name = "score_baselibs", version = "0.2.4")
+bazel_dep(name = "score_logging", version = "0.1.0")
+
+# TODO: remove once inherited properly from `score_logging`.
+bazel_dep(name = "trlc", version = "0.0.0", dev_dependency = True)
+git_override(
+    module_name = "trlc",
+    commit = "650b51a47264a4f232b3341f473527710fc32669",  # trlc-2.0.2 release
+    remote = "https://github.com/bmw-software-engineering/trlc.git",
+)
 
 # Hedron's Compile Commands Extractor for Bazel
 # https://github.com/hedronvision/bazel-compile-commands-extractor

MODULE.bazel.lock

@@ -32,6 +32,6 @@ cc_library(
         "//src/launch_manager_daemon/common:log",
         "//src/launch_manager_daemon/common:osal",
         "@score_baselibs//score/concurrency/future",
-        "@score_baselibs//score/mw/log",
+        "@score_logging//score/mw/log",
     ],
 )

src/control_client_lib/BUILD

@@ -52,8 +52,8 @@ cc_binary_with_common_opts(
         "//src/launch_manager_daemon/health_monitor_lib:health_monitor",
         "//src/launch_manager_daemon/process_state_client_lib:process_state_client",
         "@flatbuffers",
-        "@score_baselibs//score/mw/log",
         "@score_baselibs//score/result",
+        "@score_logging//score/mw/log",
     ],
 )
 
@@ -84,7 +84,7 @@ cc_library(
         "//src/launch_manager_daemon/common:log",
         "//src/launch_manager_daemon/health_monitor_lib:health_monitor",
         "@flatbuffers",
-        "@score_baselibs//score/mw/log",
+        "@score_logging//score/mw/log",
         "@score_baselibs//score/result",
     ],
 )

src/launch_manager_daemon/BUILD

@@ -48,7 +48,7 @@ cc_library_with_common_opts(
     ],
     visibility = ["//src:__pkg__"],
     deps = [
-        "@score_baselibs//score/mw/log",
+        "@score_logging//score/mw/log",
     ],
 )
 
@@ -68,7 +68,7 @@ cc_library_with_common_opts(
     visibility = ["//src:__pkg__"],
     deps = [
         "//src/launch_manager_daemon/process_state_client_lib:process_state_client",
-        "@score_baselibs//score/mw/log",
+        "@score_logging//score/mw/log",
     ],
 )
 
@@ -118,7 +118,7 @@ cc_library_with_common_opts(
         "src/score/lcm/saf/logging",
     ],
     deps = [
-        "@score_baselibs//score/mw/log",
+        "@score_logging//score/mw/log",
     ],
 )
 
@@ -138,7 +138,7 @@ cc_library_with_common_opts(
     deps = [
         ":config",
         "//src/launch_manager_daemon/recovery_client_lib:recovery_client",
-        "@score_baselibs//score/mw/log",
+        "@score_logging//score/mw/log",
     ],
 )
 
@@ -305,7 +305,7 @@ cc_library_with_common_opts(
         ":supervision",
         ":timers",
         "@flatbuffers//:flatc",
-        "@score_baselibs//score/mw/log",
+        "@score_logging//score/mw/log",
     ],
 )
 

src/launch_manager_daemon/health_monitor_lib/BUILD

@@ -37,7 +37,7 @@ cc_library(
         "//src/launch_manager_daemon/common:lifecycle_error",
         "//src/launch_manager_daemon/common:log",
         "//src/launch_manager_daemon/common:osal",
-        "@score_baselibs//score/mw/log",
         "@score_baselibs//score/result",
+        "@score_logging//score/mw/log",
     ],
 )

src/launch_manager_daemon/lifecycle_client_lib/BUILD

@@ -31,8 +31,8 @@ cc_library(
         "//src/launch_manager_daemon/common:identifier_hash",
         "//src/launch_manager_daemon/common:lifecycle_error",
         "//src/launch_manager_daemon/common:log",
-        "@score_baselibs//score/mw/log",
         "@score_baselibs//score/result",
+        "@score_logging//score/mw/log",
     ],
 )
 

src/launch_manager_daemon/process_state_client_lib/BUILD

@@ -47,9 +47,9 @@ cc_library(
         "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client",
         "@score_baselibs//score/language/futurecpp",
         "@score_baselibs//score/memory:string_literal",
-        "@score_baselibs//score/mw/log",
         "@score_baselibs//score/os:stdlib",
         "@score_baselibs//score/os/utils:signal",
+        "@score_logging//score/mw/log",
     ],
 )
 
@@ -65,9 +65,9 @@ cc_library(
     tags = ["FUSA"],
     deps = [
         "@score_baselibs//score/memory:string_literal",
-        "@score_baselibs//score/mw/log",
         "@score_baselibs//score/os:stdlib",
         "@score_baselibs//score/os/utils:signal",
+        "@score_logging//score/mw/log",
     ],
 )
 
@@ -117,9 +117,9 @@ cc_library(
     deps = [
         ":application",
         "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client",
-        "@score_baselibs//score/mw/log",
         "@score_baselibs//score/os:stdlib",
         "@score_baselibs//score/os/utils:signal",
+        "@score_logging//score/mw/log",
     ],
 )