Skip to content

Using flatbuffer rules from baselibs #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MaciejKaszynski wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Using flatbuffer rules from baselibs #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
300 changes: 61 additions & 239 deletions MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

77 changes: 0 additions & 77 deletions config/flatbuffers_rules.bzl
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions scripts/config_mapping/config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
),
},
Expand Down
17 changes: 2 additions & 15 deletions src/launch_manager_daemon/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
21 changes: 19 additions & 2 deletions src/launch_manager_daemon/config/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Loading
Loading