Skip to content

Commit c6506c2

Browse files
Migrate to new launch manager configuration
1 parent 5a72c15 commit c6506c2

File tree

9 files changed

+131
-419
lines changed

9 files changed

+131
-419
lines changed

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,4 @@ toolchains_qnx.sdp(
7171
)
7272
use_repo(toolchains_qnx, "toolchains_qnx_sdp")
7373
use_repo(toolchains_qnx, "toolchains_qnx_ifs")
74+

bazel_common/score_modules_target_sw.MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ git_override(
6767
bazel_dep(name = "score_lifecycle_health")
6868
git_override(
6969
module_name = "score_lifecycle_health",
70-
commit = "14ee704eeac03e03ca10bece5de8b694d3c5e2dd",
71-
remote = "https://github.com/eclipse-score/lifecycle.git",
70+
commit = "e538003a2cdb30b03c78158894dbd7289ea99479",
71+
remote = "https://github.com/etas-contrib/score_lifecycle.git",
7272
)
7373

7474
bazel_dep(name = "score_logging")

showcases/simple_lifecycle/BUILD

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
load("@rules_cc//cc:cc_library.bzl", "cc_library")
1414
load("//bazel_common:bundlers.bzl", "score_pkg_bundle")
1515

16+
load("@score_lifecycle_health//:defs.bzl", "launch_manager_config")
17+
launch_manager_config(
18+
name ="lifecycle_configs",
19+
config="//showcases/simple_lifecycle/configs:launch_manager_config.json"
20+
)
21+
1622
score_pkg_bundle(
1723
name = "simple_lifecycle",
1824
bins = [
@@ -26,57 +32,6 @@ score_pkg_bundle(
2632
"//showcases/simple_lifecycle:simple_lifecycle.score.json",
2733
],
2834
custom_layout = {
29-
":lm_demo.bin": "etc/lm_demo.bin",
30-
":hm_demo.bin": "etc/hm_demo.bin",
31-
":cpp_supervised_app_demo.bin": "etc/cpp_supervised_app_demo.bin",
32-
":rust_supervised_app_demo.bin": "etc/rust_supervised_app_demo.bin",
35+
":lifecycle_configs": "etc/",
3336
},
3437
)
35-
36-
genrule(
37-
name = "gen_lm_demo.bin",
38-
srcs = [
39-
"@score_lifecycle_health//src/launch_manager_daemon:lm_flatcfg_fbs",
40-
"//showcases/simple_lifecycle/configs:lm_demo.json",
41-
],
42-
outs = ["lm_demo.bin"],
43-
cmd = "$(location @flatbuffers//:flatc) --binary $(SRCS) && mv lm_demo.bin $(location lm_demo.bin)",
44-
tools = ["@flatbuffers//:flatc"],
45-
visibility = ["//visibility:public"],
46-
)
47-
48-
genrule(
49-
name = "gen_hm_demo.bin",
50-
srcs = [
51-
"@score_lifecycle_health//src/launch_manager_daemon/health_monitor_lib:hm_flatcfg_fbs",
52-
"//showcases/simple_lifecycle/configs:hm_demo.json",
53-
],
54-
outs = ["hm_demo.bin"],
55-
cmd = "$(location @flatbuffers//:flatc) --binary $(SRCS) && mv hm_demo.bin $(location hm_demo.bin)",
56-
tools = ["@flatbuffers//:flatc"],
57-
visibility = ["//visibility:public"],
58-
)
59-
60-
genrule(
61-
name = "gen_cpp_supervised_app_demo.bin",
62-
srcs = [
63-
"@score_lifecycle_health//src/launch_manager_daemon/health_monitor_lib:hm_flatcfg_fbs",
64-
"//showcases/simple_lifecycle/configs:cpp_supervised_app_demo.json",
65-
],
66-
outs = ["cpp_supervised_app_demo.bin"],
67-
cmd = "$(location @flatbuffers//:flatc) --binary $(SRCS) && mv cpp_supervised_app_demo.bin $(location cpp_supervised_app_demo.bin)",
68-
tools = ["@flatbuffers//:flatc"],
69-
visibility = ["//visibility:public"],
70-
)
71-
72-
genrule(
73-
name = "gen_rust_supervised_app_demo.bin",
74-
srcs = [
75-
"@score_lifecycle_health//src/launch_manager_daemon/health_monitor_lib:hm_flatcfg_fbs",
76-
"//showcases/simple_lifecycle/configs:rust_supervised_app_demo.json",
77-
],
78-
outs = ["rust_supervised_app_demo.bin"],
79-
cmd = "$(location @flatbuffers//:flatc) --binary $(SRCS) && mv rust_supervised_app_demo.bin $(location rust_supervised_app_demo.bin)",
80-
tools = ["@flatbuffers//:flatc"],
81-
visibility = ["//visibility:public"],
82-
)

showcases/simple_lifecycle/configs/BUILD

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313
exports_files([
14-
"hm_demo.json",
15-
"lm_demo.json",
16-
"cpp_supervised_app_demo.json",
17-
"rust_supervised_app_demo.json",
14+
"launch_manager_config.json"
1815
])

showcases/simple_lifecycle/configs/cpp_supervised_app_demo.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

showcases/simple_lifecycle/configs/hm_demo.json

Lines changed: 0 additions & 165 deletions
This file was deleted.

0 commit comments

Comments
 (0)