Skip to content

Commit caf5a18

Browse files
Using flatbuffer rules from baselibs (#173)
* Using flatbuffer rules from baselibs * Removing flatbuffers dependency Fixing docs * fixing formatters Fixing visbility fixing visibility * building * Making changes backwards compatible * Fixing formatting & doc build * Reducing default json visibility * Using filegroups --------- Co-authored-by: Nicolas Fußberger <145956508+NicolasFussberger@users.noreply.github.com>
1 parent 01c393b commit caf5a18

17 files changed

Lines changed: 202 additions & 2445 deletions

File tree

MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ bazel_dep(name = "rules_oci", version = "2.3.0")
2525
bazel_dep(name = "aspect_rules_lint", version = "2.3.0")
2626
bazel_dep(name = "buildifier_prebuilt", version = "8.5.1")
2727
bazel_dep(name = "platforms", version = "1.0.0")
28-
bazel_dep(name = "flatbuffers", version = "25.12.19")
2928
bazel_dep(name = "download_utils", version = "1.2.2")
3029
bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
3130

MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/demo_verification/BUILD

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,19 @@ pkg_files(
3838

3939
pkg_files(
4040
name = "examples_etc_files",
41-
srcs = [":examples_test_config"],
42-
prefix = "tests/examples",
43-
)
44-
45-
pkg_files(
46-
name = "examples_logging_files",
4741
srcs = [
4842
"ecu_logging_config.json",
4943
"hm_logging.json",
5044
"logging.json",
45+
":examples_test_config",
5146
],
52-
prefix = "tests/examples/etc",
47+
prefix = "tests/examples",
5348
)
5449

5550
pkg_tar(
5651
name = "examples_binaries",
5752
srcs = [
5853
":examples_etc_files",
59-
":examples_logging_files",
6054
":examples_main_files",
6155
],
6256
)

score/launch_manager/src/alive/src/details/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ cc_library(
2929
strip_include_prefix = "/score/launch_manager/src/alive/src/details",
3030
visibility = ["//score/launch_manager/src/alive:__pkg__"],
3131
deps = [
32+
"//score/launch_manager/src/daemon/src/alive_monitor/config",
3233
"//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:data_structures",
3334
"//score/launch_manager/src/daemon/src/alive_monitor/details/ipc:ipc_if",
3435
"//score/launch_manager/src/daemon/src/alive_monitor/details/logging:phm_logging",
3536
"//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock",
36-
"@flatbuffers",
37+
"@score_baselibs//score/flatbuffers:flatbufferscpp",
3738
],
3839
)

score/launch_manager/src/daemon/src/alive_monitor/BUILD

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,6 @@
1212
# *******************************************************************************
1313
load("@rules_cc//cc:defs.bzl", "cc_library")
1414

15-
filegroup(
16-
name = "am_flatcfg_fbs",
17-
srcs = ["config/hm_flatcfg.fbs"],
18-
visibility = ["//visibility:public"],
19-
)
20-
21-
filegroup(
22-
name = "am_core_flatcfg_fbs",
23-
srcs = ["config/hmcore_flatcfg.fbs"],
24-
visibility = ["//visibility:public"],
25-
)
26-
27-
exports_files(["config/hm_flatcfg.fbs"])
28-
29-
cc_library(
30-
name = "config",
31-
hdrs = [
32-
"config/hm_flatcfg_generated.h",
33-
"config/hmcore_flatcfg_generated.h",
34-
],
35-
include_prefix = "score/mw/launch_manager/alive_monitor",
36-
strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor",
37-
visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
38-
)
39-
4015
cc_library(
4116
name = "alive_monitor",
4217
visibility = ["//score:__subpackages__"],
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# *******************************************************************************
2+
# Copyright (c) 2026 Contributors to the Eclipse Foundation
3+
#
4+
# See the NOTICE file(s) distributed with this work for additional
5+
# information regarding copyright ownership.
6+
#
7+
# This program and the accompanying materials are made available under the
8+
# terms of the Apache License Version 2.0 which is available at
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# SPDX-License-Identifier: Apache-2.0
12+
# *******************************************************************************
13+
load("@score_baselibs//score/flatbuffers/bazel:codegen.bzl", "generate_cpp")
14+
15+
exports_files(
16+
[
17+
"hm_flatcfg.fbs",
18+
"hmcore_flatcfg.fbs",
19+
],
20+
visibility = ["//visibility:public"],
21+
)
22+
23+
generate_cpp(
24+
name = "hm_config",
25+
output = "hm_flatcfg_generated.h",
26+
schema = "hm_flatcfg.fbs",
27+
visibility = ["//visibility:private"],
28+
)
29+
30+
generate_cpp(
31+
name = "hmcore_config",
32+
output = "hmcore_flatcfg_generated.h",
33+
schema = "hmcore_flatcfg.fbs",
34+
visibility = ["//visibility:private"],
35+
)
36+
37+
cc_library(
38+
name = "config",
39+
hdrs = [
40+
":hm_config",
41+
":hmcore_config",
42+
],
43+
include_prefix = "score/mw/launch_manager/alive_monitor/config",
44+
visibility = [
45+
"//score/launch_manager/src/alive:__subpackages__",
46+
"//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__",
47+
],
48+
deps = [
49+
"@score_baselibs//score/flatbuffers:flatbufferscpp",
50+
],
51+
)

0 commit comments

Comments
 (0)