Using flatbuffer rules from baselibs

Author: MaciejKaszynski

.bazelrc

@@ -36,7 +36,6 @@ 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 running integration tests on localhost

MODULE.bazel

@@ -154,7 +154,11 @@ use_repo(oci, "debian-test-runtime", "debian-test-runtime_linux_amd64")
 
 bazel_dep(name = "score_baselibs_rust", version = "0.1.1")
 bazel_dep(name = "score_baselibs", version = "0.2.4")
-bazel_dep(name = "score_logging", version = "0.1.0")
+git_override(
+    module_name = "score_baselibs",
+    commit = "4de0029b909ae039e159c73d17511926cf476d19",
+    remote = "https://github.com/eclipse-score/baselibs.git",
+)
 
 # TODO: remove once inherited properly from `score_logging`.
 bazel_dep(name = "trlc", version = "0.0.0", dev_dependency = True)

MODULE.bazel.lock

@@ -117,17 +117,17 @@ launch_manager_config = rule(
         ),
         "lm_schema": attr.label(
             allow_single_file = [".fbs"],
-            default = Label("//src/launch_manager_daemon:lm_flatcfg_fbs"),
+            default = Label("//src/launch_manager_daemon/config:lm_flatcfg.fbs"),
             doc = "Launch Manager fbs file to use",
         ),
         "hm_schema": attr.label(
             allow_single_file = [".fbs"],
-            default = Label("//src/launch_manager_daemon/health_monitor_lib:hm_flatcfg_fbs"),
+            default = Label("//src/launch_manager_daemon/health_monitor_lib/config:hm_flatcfg.fbs"),
             doc = "HealthMonitor fbs file to use",
         ),
         "hmcore_schema": attr.label(
             allow_single_file = [".fbs"],
-            default = Label("//src/launch_manager_daemon/health_monitor_lib:hmcore_flatcfg_fbs"),
+            default = Label("//src/launch_manager_daemon/health_monitor_lib/config:hmcore_flatcfg.fbs"),
             doc = "HealthMonitor core fbs file to use",
         ),
     },

config/flatbuffers_rules.bzl

@@ -14,18 +14,6 @@ load("//config:common_cc.bzl", "cc_binary_with_common_opts", "cc_library_with_co
 
 package(default_visibility = ["//tests:__subpackages__"])
 
-filegroup(
-    name = "lm_flatcfg_fbs",
-    srcs = ["//src/launch_manager_daemon/config:lm_flatcfg.fbs"],
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "config",
-    hdrs = ["//src/launch_manager_daemon/config:lm_flatcfg_generated.h"],
-    includes = ["config"],
-    visibility = ["//src:__pkg__"],
-)
 
 cc_binary_with_common_opts(
     name = "launch_manager",
@@ -42,7 +30,7 @@ cc_binary_with_common_opts(
     }),
     visibility = ["//visibility:public"],
     deps = [
-        ":config",
+        "//src/launch_manager_daemon/config:config_lib",
         "//externals/ipc_dropin",
         "//src/launch_manager_daemon/common",
         "//src/launch_manager_daemon/common:control_client_channel",
@@ -74,8 +62,7 @@ cc_library(
         "src",
     ],
     deps = [
-        # Must match launch_manager deps
-        ":config",
+        "//src/launch_manager_daemon/config:config_lib",
         "//externals/ipc_dropin",
         "//src/launch_manager_daemon/common",
         "//src/launch_manager_daemon/common:control_client_channel",

scripts/config_mapping/config.bzl

@@ -10,7 +10,24 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
+load("@score_baselibs//score/flatbuffers/bazel:codegen.bzl", "generate_cpp")
+
 exports_files([
     "lm_flatcfg.fbs",
-    "lm_flatcfg_generated.h",
-])
+    ],
+    visibility = ["//visibility:public"],
+)
+
+generate_cpp(
+    name = "config",
+    output = "lm_flatcfg_generated.h",
+    schema = "lm_flatcfg.fbs",
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "config_lib",
+    hdrs = [":config"],
+    strip_include_prefix = ".",
+    visibility = ["//visibility:public"],
+)