From 1c4e08fed70f32faea4601f6bc67e99ee62c6086 Mon Sep 17 00:00:00 2001 From: Vuk Pavic Date: Wed, 13 May 2026 14:57:19 +0200 Subject: [PATCH 1/2] Align public bazel target names --- score/mw/health/BUILD | 24 ++++++++ score/mw/lifecycle/BUILD | 59 +++++++++++++++++++ src/control_client_lib/BUILD | 1 + src/health_monitoring_lib/BUILD | 2 + src/launch_manager_daemon/BUILD | 1 + .../health_monitor_lib/BUILD | 1 + .../health_monitor_lib/rust_bindings/BUILD | 1 + .../lifecycle_client_lib/rust_bindings/BUILD | 1 + src/lifecycle_client_lib/BUILD | 1 + 9 files changed, 91 insertions(+) create mode 100644 score/mw/health/BUILD create mode 100644 score/mw/lifecycle/BUILD diff --git a/score/mw/health/BUILD b/score/mw/health/BUILD new file mode 100644 index 000000000..2c108d6bb --- /dev/null +++ b/score/mw/health/BUILD @@ -0,0 +1,24 @@ +# ******************************************************************************* +# Copyright (c) 2025 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0 +# +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + +package(default_visibility = ["//visibility:public"]) + +alias( + name = "health_monitoring_cc", + actual = "//src/health_monitoring_lib:health_monitoring_lib_cc", +) + +alias( + name = "health_monitoring_rust", + actual = "//src/health_monitoring_lib:health_monitoring_lib", +) diff --git a/score/mw/lifecycle/BUILD b/score/mw/lifecycle/BUILD new file mode 100644 index 000000000..4666a0fb8 --- /dev/null +++ b/score/mw/lifecycle/BUILD @@ -0,0 +1,59 @@ +# ******************************************************************************* +# Copyright (c) 2025 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0 +# +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + +package(default_visibility = ["//visibility:public"]) + +alias( + name = "lifecycle_cc", + actual = "//src/lifecycle_client_lib:lifecycle_client_lib", +) + +alias( + name = "lifecycle_rust", + actual = "//src/launch_manager_daemon/lifecycle_client_lib/rust_bindings:lifecycle_client_rs", +) + +alias( + name = "control_cc", + actual = "//src/control_client_lib:control_client_lib", +) + +alias( + name = "alive_cc", + actual = "//src/launch_manager_daemon/health_monitor_lib:hm_shared_lib", +) + +alias( + name = "alive_rust", + actual = "//src/launch_manager_daemon/health_monitor_lib/rust_bindings:monitor_rs", +) + +alias( + name = "lifecycle", + actual = ":lifecycle_cc", +) + +alias( + name = "control", + actual = ":control_cc", +) + +alias( + name = "alive", + actual = ":alive_cc", +) + +alias( + name = "launch_manager", + actual = "//src/launch_manager_daemon:launch_manager", +) diff --git a/src/control_client_lib/BUILD b/src/control_client_lib/BUILD index d119de279..d5819d575 100644 --- a/src/control_client_lib/BUILD +++ b/src/control_client_lib/BUILD @@ -23,6 +23,7 @@ cc_library( "include/score/lcm/control_client.h", ], includes = ["include"], + deprecation = "Use //score/mw/lifecycle:control_cc instead.", visibility = ["//visibility:public"], deps = [ "//src/launch_manager_daemon/common", diff --git a/src/health_monitoring_lib/BUILD b/src/health_monitoring_lib/BUILD index 002486ea5..decd85238 100644 --- a/src/health_monitoring_lib/BUILD +++ b/src/health_monitoring_lib/BUILD @@ -51,6 +51,7 @@ rust_library( srcs = glob(["rust/**/*.rs"]), crate_root = "rust/lib.rs", proc_macro_deps = PROC_MACRO_DEPS, + deprecation = "Use //score/mw/health:health_monitoring_rust instead.", visibility = ["//visibility:public"], deps = COMMON_DEPS, ) @@ -61,6 +62,7 @@ cc_library( srcs = CC_SOURCES, hdrs = CC_HDRS, strip_include_prefix = "cpp/include", + deprecation = "Use //score/mw/health:health_monitoring_cc instead.", visibility = ["//visibility:public"], deps = [ ":health_monitoring_lib_ffi", diff --git a/src/launch_manager_daemon/BUILD b/src/launch_manager_daemon/BUILD index b6b2e6f4b..937b4af17 100644 --- a/src/launch_manager_daemon/BUILD +++ b/src/launch_manager_daemon/BUILD @@ -40,6 +40,7 @@ cc_binary_with_common_opts( "@platforms//os:qnx": ["-lsecpol"], "@platforms//os:linux": ["-lpthread"], }), + deprecation = "Use //score/mw/lifecycle:launch_manager instead.", visibility = ["//visibility:public"], deps = [ ":config", diff --git a/src/launch_manager_daemon/health_monitor_lib/BUILD b/src/launch_manager_daemon/health_monitor_lib/BUILD index ecafe2164..2226f7e31 100644 --- a/src/launch_manager_daemon/health_monitor_lib/BUILD +++ b/src/launch_manager_daemon/health_monitor_lib/BUILD @@ -323,6 +323,7 @@ cc_library_with_common_opts( includes = [ "include", ], + deprecation = "Use //score/mw/lifecycle:alive_cc instead.", visibility = ["//visibility:public"], deps = [ ":hm-lib", diff --git a/src/launch_manager_daemon/health_monitor_lib/rust_bindings/BUILD b/src/launch_manager_daemon/health_monitor_lib/rust_bindings/BUILD index a93ffb18b..f8f63bcf7 100644 --- a/src/launch_manager_daemon/health_monitor_lib/rust_bindings/BUILD +++ b/src/launch_manager_daemon/health_monitor_lib/rust_bindings/BUILD @@ -21,6 +21,7 @@ rust_library( "src/lib.rs", "src/monitor.rs", ], + deprecation = "Use //score/mw/lifecycle:alive_rust instead.", deps = [ "//src/launch_manager_daemon/health_monitor_lib:hm_shared_lib", "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", diff --git a/src/launch_manager_daemon/lifecycle_client_lib/rust_bindings/BUILD b/src/launch_manager_daemon/lifecycle_client_lib/rust_bindings/BUILD index 5cbfab66c..cd64adeb4 100644 --- a/src/launch_manager_daemon/lifecycle_client_lib/rust_bindings/BUILD +++ b/src/launch_manager_daemon/lifecycle_client_lib/rust_bindings/BUILD @@ -20,6 +20,7 @@ rust_library( "src/lib.rs", "src/lifecycle.rs", ], + deprecation = "Use //score/mw/lifecycle:lifecycle_rust instead.", deps = [ "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", "@score_crates//:libc", diff --git a/src/lifecycle_client_lib/BUILD b/src/lifecycle_client_lib/BUILD index a30ce94b7..4ea018180 100644 --- a/src/lifecycle_client_lib/BUILD +++ b/src/lifecycle_client_lib/BUILD @@ -42,6 +42,7 @@ cc_library( "@platforms//os:qnx": [], "@platforms//os:linux": ["-lpthread"], }), + deprecation = "Use //score/mw/lifecycle:lifecycle_cc instead.", visibility = ["//visibility:public"], deps = [ "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", From d50c7ab132fcceed38b440f94c0ac4cdc4faa65e Mon Sep 17 00:00:00 2001 From: Vuk Pavic Date: Thu, 14 May 2026 12:20:12 +0200 Subject: [PATCH 2/2] Replace deprecated library references to remove build warnings --- examples/BUILD | 4 ++-- examples/control_application/BUILD | 2 +- examples/cpp_lifecycle_app/BUILD | 2 +- examples/cpp_supervised_app/BUILD | 4 ++-- examples/rust_supervised_app/BUILD | 4 ++-- src/control_client_lib/BUILD | 1 - src/health_monitoring_lib/BUILD | 4 +--- src/launch_manager_daemon/BUILD | 1 - src/launch_manager_daemon/health_monitor_lib/BUILD | 3 +-- .../health_monitor_lib/rust_bindings/BUILD | 3 +-- .../lifecycle_client_lib/rust_bindings/BUILD | 1 - src/lifecycle_client_lib/BUILD | 1 - tests/integration/incorrect_config_non_reporting/BUILD | 2 +- tests/integration/smoke/BUILD | 6 +++--- 14 files changed, 15 insertions(+), 23 deletions(-) diff --git a/examples/BUILD b/examples/BUILD index 5bcc24f37..4c8080d23 100644 --- a/examples/BUILD +++ b/examples/BUILD @@ -32,8 +32,8 @@ filegroup( filegroup( name = "lm_binaries", srcs = [ - "//src/control_client_lib", - "//src/launch_manager_daemon:launch_manager", + "//score/mw/lifecycle:control_cc", + "//score/mw/lifecycle:launch_manager", "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", "//src/launch_manager_daemon/process_state_client_lib:process_state_client", ], diff --git a/examples/control_application/BUILD b/examples/control_application/BUILD index ddb814f5e..d25b46a7d 100644 --- a/examples/control_application/BUILD +++ b/examples/control_application/BUILD @@ -53,7 +53,7 @@ cc_binary( visibility = ["//visibility:public"], deps = [ "//externals/ipc_dropin", - "//src/control_client_lib", + "//score/mw/lifecycle:control_cc", "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", ], ) diff --git a/examples/cpp_lifecycle_app/BUILD b/examples/cpp_lifecycle_app/BUILD index 5236aea32..883b97dbf 100644 --- a/examples/cpp_lifecycle_app/BUILD +++ b/examples/cpp_lifecycle_app/BUILD @@ -25,7 +25,7 @@ cc_binary( }), visibility = ["//visibility:public"], deps = [ - "//src/lifecycle_client_lib", + "//score/mw/lifecycle:lifecycle_cc", "@score_baselibs//score/mw/log", ], ) diff --git a/examples/cpp_supervised_app/BUILD b/examples/cpp_supervised_app/BUILD index 654f841c6..2dcc73602 100644 --- a/examples/cpp_supervised_app/BUILD +++ b/examples/cpp_supervised_app/BUILD @@ -30,8 +30,8 @@ cc_binary( }), visibility = ["//visibility:public"], deps = [ - "//src/health_monitoring_lib:health_monitoring_lib_cc", - "//src/launch_manager_daemon/health_monitor_lib:hm_shared_lib", + "//score/mw/health:health_monitoring_cc", + "//score/mw/lifecycle:alive_cc", "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", "@score_baselibs_rust//src/log/stdout_logger_cpp_init", ], diff --git a/examples/rust_supervised_app/BUILD b/examples/rust_supervised_app/BUILD index 6cb6b38b1..d89ef4908 100644 --- a/examples/rust_supervised_app/BUILD +++ b/examples/rust_supervised_app/BUILD @@ -34,8 +34,8 @@ rust_binary( ], }), deps = [ - "//src/health_monitoring_lib", - "//src/launch_manager_daemon/lifecycle_client_lib/rust_bindings:lifecycle_client_rs", + "//score/mw/health:health_monitoring_rust", + "//score/mw/lifecycle:lifecycle_rust", "@score_baselibs_rust//src/log/score_log", "@score_baselibs_rust//src/log/stdout_logger", "@score_crates//:clap", diff --git a/src/control_client_lib/BUILD b/src/control_client_lib/BUILD index d5819d575..d119de279 100644 --- a/src/control_client_lib/BUILD +++ b/src/control_client_lib/BUILD @@ -23,7 +23,6 @@ cc_library( "include/score/lcm/control_client.h", ], includes = ["include"], - deprecation = "Use //score/mw/lifecycle:control_cc instead.", visibility = ["//visibility:public"], deps = [ "//src/launch_manager_daemon/common", diff --git a/src/health_monitoring_lib/BUILD b/src/health_monitoring_lib/BUILD index decd85238..f8eb508e7 100644 --- a/src/health_monitoring_lib/BUILD +++ b/src/health_monitoring_lib/BUILD @@ -19,7 +19,7 @@ COMMON_DEPS = [ "@score_baselibs_rust//src/containers:containers", "@score_baselibs_rust//src/thread:thread", "@score_baselibs_rust//src/log/score_log:score_log", - "//src/launch_manager_daemon/health_monitor_lib/rust_bindings:monitor_rs", + "//score/mw/lifecycle:alive_rust", ] PROC_MACRO_DEPS = [ @@ -51,7 +51,6 @@ rust_library( srcs = glob(["rust/**/*.rs"]), crate_root = "rust/lib.rs", proc_macro_deps = PROC_MACRO_DEPS, - deprecation = "Use //score/mw/health:health_monitoring_rust instead.", visibility = ["//visibility:public"], deps = COMMON_DEPS, ) @@ -62,7 +61,6 @@ cc_library( srcs = CC_SOURCES, hdrs = CC_HDRS, strip_include_prefix = "cpp/include", - deprecation = "Use //score/mw/health:health_monitoring_cc instead.", visibility = ["//visibility:public"], deps = [ ":health_monitoring_lib_ffi", diff --git a/src/launch_manager_daemon/BUILD b/src/launch_manager_daemon/BUILD index 937b4af17..b6b2e6f4b 100644 --- a/src/launch_manager_daemon/BUILD +++ b/src/launch_manager_daemon/BUILD @@ -40,7 +40,6 @@ cc_binary_with_common_opts( "@platforms//os:qnx": ["-lsecpol"], "@platforms//os:linux": ["-lpthread"], }), - deprecation = "Use //score/mw/lifecycle:launch_manager instead.", visibility = ["//visibility:public"], deps = [ ":config", diff --git a/src/launch_manager_daemon/health_monitor_lib/BUILD b/src/launch_manager_daemon/health_monitor_lib/BUILD index 2226f7e31..745520781 100644 --- a/src/launch_manager_daemon/health_monitor_lib/BUILD +++ b/src/launch_manager_daemon/health_monitor_lib/BUILD @@ -277,7 +277,7 @@ cc_library_with_common_opts( ":factory", ":rb-watchdog-if", "//externals/ipc_dropin", - "//src/control_client_lib", + "//score/mw/lifecycle:control_cc", "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", ], ) @@ -323,7 +323,6 @@ cc_library_with_common_opts( includes = [ "include", ], - deprecation = "Use //score/mw/lifecycle:alive_cc instead.", visibility = ["//visibility:public"], deps = [ ":hm-lib", diff --git a/src/launch_manager_daemon/health_monitor_lib/rust_bindings/BUILD b/src/launch_manager_daemon/health_monitor_lib/rust_bindings/BUILD index f8f63bcf7..447372ebf 100644 --- a/src/launch_manager_daemon/health_monitor_lib/rust_bindings/BUILD +++ b/src/launch_manager_daemon/health_monitor_lib/rust_bindings/BUILD @@ -21,9 +21,8 @@ rust_library( "src/lib.rs", "src/monitor.rs", ], - deprecation = "Use //score/mw/lifecycle:alive_rust instead.", deps = [ - "//src/launch_manager_daemon/health_monitor_lib:hm_shared_lib", + "//score/mw/lifecycle:alive_cc", "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", "@score_crates//:libc", ], diff --git a/src/launch_manager_daemon/lifecycle_client_lib/rust_bindings/BUILD b/src/launch_manager_daemon/lifecycle_client_lib/rust_bindings/BUILD index cd64adeb4..5cbfab66c 100644 --- a/src/launch_manager_daemon/lifecycle_client_lib/rust_bindings/BUILD +++ b/src/launch_manager_daemon/lifecycle_client_lib/rust_bindings/BUILD @@ -20,7 +20,6 @@ rust_library( "src/lib.rs", "src/lifecycle.rs", ], - deprecation = "Use //score/mw/lifecycle:lifecycle_rust instead.", deps = [ "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", "@score_crates//:libc", diff --git a/src/lifecycle_client_lib/BUILD b/src/lifecycle_client_lib/BUILD index 4ea018180..a30ce94b7 100644 --- a/src/lifecycle_client_lib/BUILD +++ b/src/lifecycle_client_lib/BUILD @@ -42,7 +42,6 @@ cc_library( "@platforms//os:qnx": [], "@platforms//os:linux": ["-lpthread"], }), - deprecation = "Use //score/mw/lifecycle:lifecycle_cc instead.", visibility = ["//visibility:public"], deps = [ "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", diff --git a/tests/integration/incorrect_config_non_reporting/BUILD b/tests/integration/incorrect_config_non_reporting/BUILD index 295df30a5..0ee22c7b4 100644 --- a/tests/integration/incorrect_config_non_reporting/BUILD +++ b/tests/integration/incorrect_config_non_reporting/BUILD @@ -40,7 +40,7 @@ pkg_files( name = "non_reporting_main_files", srcs = [ ":non_reporting_process", - "//src/launch_manager_daemon:launch_manager", + "//score/mw/lifecycle:launch_manager", ], attributes = pkg_attributes(mode = "0755"), prefix = "tests/incorrect_config_non_reporting", diff --git a/tests/integration/smoke/BUILD b/tests/integration/smoke/BUILD index 864fe7e2c..edaef96e1 100644 --- a/tests/integration/smoke/BUILD +++ b/tests/integration/smoke/BUILD @@ -35,7 +35,7 @@ cc_binary( srcs = ["control_daemon_mock.cpp"], data = [], deps = [ - "//src/control_client_lib", + "//score/mw/lifecycle:control_cc", "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", "//tests/utils/test_helper", "@googletest//:gtest_main", @@ -46,7 +46,7 @@ cc_binary( name = "gtest_process", srcs = ["gtest_process.cpp"], deps = [ - "//src/control_client_lib", + "//score/mw/lifecycle:control_cc", "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client", "//tests/utils/test_helper", "@googletest//:gtest_main", @@ -58,7 +58,7 @@ pkg_files( srcs = [ ":control_daemon_mock", ":gtest_process", - "//src/launch_manager_daemon:launch_manager", + "//score/mw/lifecycle:launch_manager", ], attributes = pkg_attributes(mode = "0755"), prefix = "tests/smoke",