From 1d0f496e615e8d981c0446b49ba98f9897b6ce8a Mon Sep 17 00:00:00 2001 From: William Roebuck <244554584+WilliamRoebuck@users.noreply.github.com> Date: Fri, 7 Aug 2026 14:32:37 +0100 Subject: [PATCH] Remove combined target --- .../daemon/src/process_group_manager/BUILD | 17 +++------- .../src/process_group_manager/details/BUILD | 34 +------------------ .../details/graph_UT.cpp | 1 - .../{details => }/process_group_manager.cpp | 0 4 files changed, 5 insertions(+), 47 deletions(-) rename score/launch_manager/src/daemon/src/process_group_manager/{details => }/process_group_manager.cpp (100%) diff --git a/score/launch_manager/src/daemon/src/process_group_manager/BUILD b/score/launch_manager/src/daemon/src/process_group_manager/BUILD index f368d9de78..d9dbb62a39 100644 --- a/score/launch_manager/src/daemon/src/process_group_manager/BUILD +++ b/score/launch_manager/src/daemon/src/process_group_manager/BUILD @@ -58,14 +58,13 @@ cc_library( ], ) -# Header-only target for process_group_manager.hpp; used by details:process_group_manager_impl -# to break the circular header dependency without creating a Bazel cycle. cc_library( - name = "process_group_manager_hdrs", + name = "process_group_manager", + srcs = ["process_group_manager.cpp"], hdrs = ["process_group_manager.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager", strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager", - visibility = ["//score/launch_manager/src/daemon/src/process_group_manager/details:__pkg__"], + visibility = ["//score:__subpackages__"], deps = [ ":ialive_monitor_thread", ":iprocess", @@ -81,6 +80,7 @@ cc_library( "//score/launch_manager/src/daemon/src/process_group_manager/details:os_handler", "//score/launch_manager/src/daemon/src/process_group_manager/details:process_info_node", "//score/launch_manager/src/daemon/src/process_group_manager/details:process_launcher", + "//score/launch_manager/src/daemon/src/process_group_manager/details:process_monitor", "//score/launch_manager/src/daemon/src/process_group_manager/details:safe_process_map", "//score/launch_manager/src/daemon/src/process_state_client:iprocess_state_notifier", "//score/launch_manager/src/daemon/src/recovery_client", @@ -88,12 +88,3 @@ cc_library( "@score_baselibs//score/language/futurecpp", ], ) - -cc_library( - name = "process_group_manager", - visibility = ["//score:__subpackages__"], - deps = [ - ":process_group_manager_hdrs", - "//score/launch_manager/src/daemon/src/process_group_manager/details:process_group_manager_impl", - ], -) diff --git a/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD b/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD index 08a075608b..b055fcb48b 100644 --- a/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD +++ b/score/launch_manager/src/daemon/src/process_group_manager/details/BUILD @@ -179,6 +179,7 @@ cc_library( cc_library( name = "graph", + srcs = ["graph.cpp"], hdrs = ["graph.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager/details", strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager/details", @@ -206,7 +207,6 @@ cc_test( srcs = ["graph_UT.cpp"], deps = [ ":graph", - ":process_group_manager_impl", "//score/launch_manager/src/daemon/src/configuration:configuration_adapter", "//score/launch_manager/src/daemon/src/process_group_manager:mock_iprocess", "@googletest//:gtest_main", @@ -375,38 +375,6 @@ cc_test( ], ) -# graph.cpp, process_info_node.cpp, and process_group_manager.cpp include -# process_group_manager.hpp which in turn includes graph.hpp and process_info_node.hpp — -# circular at link time, so all three must share a target. -cc_library( - name = "process_group_manager_impl", - srcs = [ - "graph.cpp", - "process_group_manager.cpp", - "process_info_node.cpp", - ], - visibility = ["//score/launch_manager/src/daemon/src/process_group_manager:__pkg__"], - deps = [ - ":component_event_queue", - ":graph", - ":os_handler", - ":process_info_node", - ":process_launcher", - ":process_monitor", - ":safe_process_map", - "//score/launch_manager/src/daemon/src/common:log", - "//score/launch_manager/src/daemon/src/common/concurrency:mpmc_concurrent_queue", - "//score/launch_manager/src/daemon/src/common/concurrency:workerthread", - "//score/launch_manager/src/daemon/src/configuration:configuration_adapter", - "//score/launch_manager/src/daemon/src/osal:ipc_comms", - "//score/launch_manager/src/daemon/src/osal:semaphore", - "//score/launch_manager/src/daemon/src/process_group_manager:process_group_manager_hdrs", - "//score/launch_manager/src/daemon/src/process_state_client", - "//score/launch_manager/src/daemon/src/recovery_client", - "@score_baselibs//score/language/futurecpp", - ], -) - cc_library( name = "itransition_result_publisher", hdrs = ["itransition_result_publisher.hpp"], diff --git a/score/launch_manager/src/daemon/src/process_group_manager/details/graph_UT.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/graph_UT.cpp index 3f886909e8..2b1de4c88e 100644 --- a/score/launch_manager/src/daemon/src/process_group_manager/details/graph_UT.cpp +++ b/score/launch_manager/src/daemon/src/process_group_manager/details/graph_UT.cpp @@ -17,7 +17,6 @@ #include "score/mw/launch_manager/configuration/configuration_adapter.hpp" #include "score/mw/launch_manager/process_group_manager/details/graph.hpp" #include "score/mw/launch_manager/process_group_manager/mock_iprocess.hpp" -#include "score/mw/launch_manager/process_group_manager/process_group_manager.hpp" namespace score::lcm::internal { diff --git a/score/launch_manager/src/daemon/src/process_group_manager/details/process_group_manager.cpp b/score/launch_manager/src/daemon/src/process_group_manager/process_group_manager.cpp similarity index 100% rename from score/launch_manager/src/daemon/src/process_group_manager/details/process_group_manager.cpp rename to score/launch_manager/src/daemon/src/process_group_manager/process_group_manager.cpp