Move files in score/launch_manager to src subdir (#255)

* Move files in score/launch_manager to src subdir

* Move everything else in launch_manager to src subdir

* Fix docu build

* Misc changes to align to report_running() instead of LifecycleClient

Author: TimoSteuerwaldETAS

BUILD

@@ -94,7 +94,7 @@ alias(
 # Docs
 docs(
     data = [
-        "//score/launch_manager/daemon/src/configuration/config_schema:config_schema_files",
+        "//score/launch_manager/src/daemon/src/configuration/config_schema:config_schema_files",
         "@score_platform//:needs_json",  # This allows linking to feature requirements.
         "@score_process//:needs_json",  # This allows linking to requirements (wp__requirements_comp, etc.) from the process_description repository.
     ],

Cargo.toml

@@ -1,8 +1,8 @@
 [workspace]
 resolver = "2"
 members = [
-    "score/launch_manager/lifecycle_client/src/rust",
-    "score/launch_manager/daemon/src/alive_monitor/rust",
+    "score/launch_manager/src/lifecycle_client/src/rust",
+    "score/launch_manager/src/daemon/src/alive_monitor/rust",
     "score/health_monitor/src",
     "examples/rust_supervised_app",
 ]
@@ -19,7 +19,7 @@ libc = "0.2.177"
 clap = { version = "4.5.49", features = ["derive"] }
 signal-hook = "0.3.18"
 
-monitor_rs = { path = "score/launch_manager/daemon/src/alive_monitor/rust" } # Temporary API
+monitor_rs = { path = "score/launch_manager/src/daemon/src/alive_monitor/rust" } # Temporary API
 health_monitoring_lib = { path = "score/health_monitor/src" }
 score_log = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
 score_testing_macros = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }

conf.py

@@ -54,7 +54,7 @@
     "docs/**",
     "examples/docs/**",
     "score/launch_manager/docs/**",
-    "score/launch_manager/lifecycle_client/docs/**",
+    "score/launch_manager/src/lifecycle_client/docs/**",
     "score/health_monitor/docs/**",
 ]
 
@@ -129,11 +129,11 @@ def setup(app):
     workspace_root = Path(os.getcwd())
     src_json_dir = (
         workspace_root
-        / "score/lifecycle/score/launch_manager/daemon/src/configuration/config_schema"
+        / "score/lifecycle/score/launch_manager/src/daemon/src/configuration/config_schema"
     )
     dest_json_dir = (
         srcdir.parent
-        / "score/lifecycle/score/launch_manager/daemon/src/configuration/config_schema"
+        / "score/lifecycle/score/launch_manager/src/daemon/src/configuration/config_schema"
     )
     if src_json_dir.exists() and not dest_json_dir.exists():
         dest_json_dir.parent.mkdir(parents=True, exist_ok=True)

examples/rust_supervised_app/Cargo.toml

@@ -11,8 +11,8 @@ path = "src/main.rs"
 clap = { workspace = true }
 libc = { workspace = true }
 signal-hook = { workspace = true }
-lifecycle_client_rs = { path = "../../score/launch_manager/lifecycle_client/src/rust" }
-monitor_rs = { path = "../../score/launch_manager/daemon/src/alive_monitor/rust" }
+lifecycle_client_rs = { path = "../../score/launch_manager/src/lifecycle_client/src/rust" }
+monitor_rs = { path = "../../score/launch_manager/src/daemon/src/alive_monitor/rust" }
 health_monitoring_lib.workspace = true
 score_log.workspace = true
 stdout_logger.workspace = true

score/launch_manager/BUILD

@@ -16,39 +16,39 @@ package(default_visibility = ["//visibility:public"])
 
 alias(
     name = "control_cc",
-    actual = "//score/launch_manager/control_client:control_client",
+    actual = "//score/launch_manager/src/control_client:control_client",
 )
 
 alias(
     name = "alive_cc",
-    actual = "//score/launch_manager/daemon/src/alive_monitor:am_shared_lib",
+    actual = "//score/launch_manager/src/daemon/src/alive_monitor:am_shared_lib",
 )
 
 alias(
     name = "alive_rust",
-    actual = "//score/launch_manager/daemon/src/alive_monitor/rust:monitor_rs",
+    actual = "//score/launch_manager/src/daemon/src/alive_monitor/rust:monitor_rs",
 )
 
 alias(
     name = "lifecycle_cc",
-    actual = "//score/launch_manager/lifecycle_client:lifecycle_client",
+    actual = "//score/launch_manager/src/lifecycle_client:lifecycle_client",
 )
 
 alias(
     name = "lifecycle_rust",
-    actual = "//score/launch_manager/lifecycle_client/src/rust:lifecycle_client_rs",
+    actual = "//score/launch_manager/src/lifecycle_client/src/rust:lifecycle_client_rs",
 )
 
 alias(
     name = "launch_manager",
-    actual = "//score/launch_manager/daemon:launch_manager",
+    actual = "//score/launch_manager/src/daemon:launch_manager",
 )
 
 cc_library(
     name = "error",
-    hdrs = ["execution_error.h"],
+    hdrs = ["src/execution_error.h"],
     include_prefix = "score/mw/lifecycle",
-    strip_include_prefix = "/score/launch_manager",
+    strip_include_prefix = "/score/launch_manager/src",
     visibility = ["//score/launch_manager:__subpackages__"],
     deps = [
         "@score_baselibs//score/result",
@@ -58,21 +58,21 @@ cc_library(
 cc_library(
     name = "error_event",
     hdrs = [
-        "execution_error.h",
-        "execution_error_event.h",
+        "src/execution_error.h",
+        "src/execution_error_event.h",
     ],
     include_prefix = "score/mw/lifecycle",
-    strip_include_prefix = "/score/launch_manager",
+    strip_include_prefix = "/score/launch_manager/src",
     visibility = ["//score/launch_manager:__subpackages__"],
     deps = [
         ":error",
-        "//score/launch_manager/daemon/src/common:identifier_hash",
+        "//score/launch_manager/src/daemon/src/common:identifier_hash",
     ],
 )
 
 cc_test(
     name = "exec_error_domain_UT",
-    srcs = ["exec_error_domain_UT.cpp"],
+    srcs = ["src/exec_error_domain_UT.cpp"],
     visibility = ["//visibility:private"],
     deps = [
         ":error",
@@ -83,47 +83,47 @@ cc_test(
 
 alias(
     name = "applicationcontext_mock_cc",
-    actual = "//score/launch_manager/lifecycle_client:applicationcontext_mock",
+    actual = "//score/launch_manager/src/lifecycle_client:applicationcontext_mock",
 )
 
 alias(
     name = "lifecycle_mock_cc",
-    actual = "//score/launch_manager/lifecycle_client:lifecycle_mock",
+    actual = "//score/launch_manager/src/lifecycle_client:lifecycle_mock",
 )
 
 alias(
     name = "report_running_mock_cc",
-    actual = "//score/launch_manager/lifecycle_client:report_running_mock",
+    actual = "//score/launch_manager/src/lifecycle_client:report_running_mock",
 )
 
 # BEGIN: Fine granular targets only needed for testing purposes
 alias(
     name = "aasapplicationcontainer_cc",
-    actual = "//score/launch_manager/lifecycle_client:aasapplicationcontainer",
+    actual = "//score/launch_manager/src/lifecycle_client:aasapplicationcontainer",
 )
 
 alias(
     name = "application_cc",
-    actual = "//score/launch_manager/lifecycle_client:application",
+    actual = "//score/launch_manager/src/lifecycle_client:application",
 )
 
 alias(
     name = "applicationcontext_cc",
-    actual = "//score/launch_manager/lifecycle_client:applicationcontext",
+    actual = "//score/launch_manager/src/lifecycle_client:applicationcontext",
 )
 
 alias(
     name = "lifecyclemanager_cc",
-    actual = "//score/launch_manager/lifecycle_client:lifecyclemanager",
+    actual = "//score/launch_manager/src/lifecycle_client:lifecyclemanager",
 )
 
 alias(
     name = "report_running_cc",
-    actual = "//score/launch_manager/lifecycle_client:report_running",
+    actual = "//score/launch_manager/src/lifecycle_client:report_running",
 )
 
 alias(
     name = "runapplication_cc",
-    actual = "//score/launch_manager/lifecycle_client:runapplication",
+    actual = "//score/launch_manager/src/lifecycle_client:runapplication",
 )
 # END: Fine granular targets only needed for testing purposes