From 348cb7ae969e14909d2296dcaccdbc4f99b5cda7 Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Sun, 1 Nov 2026 07:23:50 -0800 Subject: [PATCH] build(repo): cargo manifests use the final directories The workspace members and the path dependencies of komorebi-client, komorebic, komorebi-daemon, komorebi-linux, komorebi-macos and komorebi-hotkeys name the directories of the previous revision (komorebi-windows, komorebi-linux, komorebi-macos, komorebi-hotkeys at the top level); the dependencies of the moved crates on the shared crates are one directory shorter. cargo metadata --offline succeeds with an unchanged Cargo.lock. Source files that include files by relative path are fixed later in this stack. --- Cargo.toml | 14 +++++++------- komorebi-client/Cargo.toml | 6 +++--- komorebi-daemon/Cargo.toml | 6 +++--- komorebi-linux/Cargo.toml | 22 +++++++++++----------- komorebi-macos/Cargo.toml | 20 ++++++++++---------- komorebic/Cargo.toml | 4 ++-- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index db4f61ac..f365d753 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ resolver = "2" members = [ - "komorebi", + "komorebi-windows", "komorebi-client", "komorebi-gui", "crates/komorebi-backend", @@ -24,16 +24,16 @@ members = [ "komorebi-shortcuts", "e2e/guest/agent", "e2e/guest/testwin", - # komorebi for KDE Plasma (Linux) and komorebi for macOS: built only on their own platform, selected - # with -p; `default-members` below is the Windows set that a bare cargo command builds - "komorebi-for-kde/komorebi", - "komorebi-for-kde/komorebi-hotkeys", - "komorebi-for-mac/komorebi", + # the daemons of KDE Plasma (Linux) and macOS are built only on their own platform, selected with -p; + # `default-members` below is the Windows set that a bare cargo command builds + "komorebi-linux", + "komorebi-macos", + "komorebi-hotkeys", "crates/komorebi-version", ] default-members = [ - "komorebi", + "komorebi-windows", "komorebi-client", "komorebi-gui", "crates/komorebi-backend", diff --git a/komorebi-client/Cargo.toml b/komorebi-client/Cargo.toml index f84fa82a..0d9b354e 100644 --- a/komorebi-client/Cargo.toml +++ b/komorebi-client/Cargo.toml @@ -12,15 +12,15 @@ edition = "2024" serde_json = { workspace = true } [target.'cfg(windows)'.dependencies] -komorebi = { package = "komorebi-windows", path = "../komorebi", default-features = false } +komorebi = { package = "komorebi-windows", path = "../komorebi-windows", default-features = false } uds_windows = { workspace = true } [target.'cfg(target_os = "linux")'.dependencies] -komorebi-linux = { package = "komorebi-linux", path = "../komorebi-for-kde/komorebi", default-features = false } +komorebi-linux = { package = "komorebi-linux", path = "../komorebi-linux", default-features = false } komorebi-themes = { path = "../komorebi-themes" } [target.'cfg(target_os = "macos")'.dependencies] -komorebi-macos = { package = "komorebi-macos", path = "../komorebi-for-mac/komorebi", default-features = false } +komorebi-macos = { package = "komorebi-macos", path = "../komorebi-macos", default-features = false } komorebi-themes = { path = "../komorebi-themes" } [target.'cfg(target_os = "linux")'.dev-dependencies] diff --git a/komorebi-daemon/Cargo.toml b/komorebi-daemon/Cargo.toml index 885659ad..86ac4d72 100644 --- a/komorebi-daemon/Cargo.toml +++ b/komorebi-daemon/Cargo.toml @@ -15,13 +15,13 @@ edition = "2024" color-eyre = { workspace = true } [target.'cfg(windows)'.dependencies] -komorebi-windows = { package = "komorebi-windows", path = "../komorebi", default-features = false } +komorebi-windows = { package = "komorebi-windows", path = "../komorebi-windows", default-features = false } [target.'cfg(target_os = "linux")'.dependencies] -komorebi-linux = { package = "komorebi-linux", path = "../komorebi-for-kde/komorebi", default-features = false } +komorebi-linux = { package = "komorebi-linux", path = "../komorebi-linux", default-features = false } [target.'cfg(target_os = "macos")'.dependencies] -komorebi-macos = { package = "komorebi-macos", path = "../komorebi-for-mac/komorebi", default-features = false } +komorebi-macos = { package = "komorebi-macos", path = "../komorebi-macos", default-features = false } [features] default = ["schemars"] diff --git a/komorebi-linux/Cargo.toml b/komorebi-linux/Cargo.toml index 29971a87..f6c3079b 100644 --- a/komorebi-linux/Cargo.toml +++ b/komorebi-linux/Cargo.toml @@ -6,21 +6,21 @@ edition = "2024" [dependencies] komorebi-hotkeys = { path = "../komorebi-hotkeys" } -komorebi-themes = { path = "../../komorebi-themes" } -komorebi-backend = { path = "../../crates/komorebi-backend" } -komorebi-collections = { path = "../../crates/komorebi-collections" } -komorebi-core = { path = "../../crates/komorebi-core" } -komorebi-layouts = { path = "../../komorebi-layouts", features = ["schemars"] } -komorebi-scrolling = { path = "../../komorebi-scrolling" } -komorebi-config = { path = "../../crates/komorebi-config", default-features = false, features = [ +komorebi-themes = { path = "../komorebi-themes" } +komorebi-backend = { path = "../crates/komorebi-backend" } +komorebi-collections = { path = "../crates/komorebi-collections" } +komorebi-core = { path = "../crates/komorebi-core" } +komorebi-layouts = { path = "../komorebi-layouts", features = ["schemars"] } +komorebi-scrolling = { path = "../komorebi-scrolling" } +komorebi-config = { path = "../crates/komorebi-config", default-features = false, features = [ "schemars", ] } -komorebi-settings = { path = "../../crates/komorebi-settings" } -komorebi-protocol = { path = "../../crates/komorebi-protocol", default-features = false, features = [ +komorebi-settings = { path = "../crates/komorebi-settings" } +komorebi-protocol = { path = "../crates/komorebi-protocol", default-features = false, features = [ "schemars", ] } -komorebi-transport = { path = "../../crates/komorebi-transport" } -version = { package = "komorebi-version", path = "../../crates/komorebi-version" } +komorebi-transport = { path = "../crates/komorebi-transport" } +version = { package = "komorebi-version", path = "../crates/komorebi-version" } clap = { version = "4", features = ["derive", "wrap_help"] } color-eyre = { version = "0.6" } diff --git a/komorebi-macos/Cargo.toml b/komorebi-macos/Cargo.toml index 9d280a7a..46c9f5ab 100644 --- a/komorebi-macos/Cargo.toml +++ b/komorebi-macos/Cargo.toml @@ -5,24 +5,24 @@ description = "A tiling window manager for macOS" edition = "2024" [dependencies] -komorebi-themes = { path = "../../komorebi-themes" } -komorebi-backend = { path = "../../crates/komorebi-backend" } -komorebi-collections = { path = "../../crates/komorebi-collections" } -komorebi-core = { path = "../../crates/komorebi-core" } -komorebi-layouts = { path = "../../komorebi-layouts", features = [ +komorebi-themes = { path = "../komorebi-themes" } +komorebi-backend = { path = "../crates/komorebi-backend" } +komorebi-collections = { path = "../crates/komorebi-collections" } +komorebi-core = { path = "../crates/komorebi-core" } +komorebi-layouts = { path = "../komorebi-layouts", features = [ "darwin", "schemars", ] } -komorebi-config = { path = "../../crates/komorebi-config", default-features = false, features = [ +komorebi-config = { path = "../crates/komorebi-config", default-features = false, features = [ "schemars", ] } -komorebi-settings = { path = "../../crates/komorebi-settings" } -komorebi-protocol = { path = "../../crates/komorebi-protocol", default-features = false, features = [ +komorebi-settings = { path = "../crates/komorebi-settings" } +komorebi-protocol = { path = "../crates/komorebi-protocol", default-features = false, features = [ "schemars", ] } -komorebi-transport = { path = "../../crates/komorebi-transport" } +komorebi-transport = { path = "../crates/komorebi-transport" } quickxml_to_serde = { git = "https://github.com/LGUG2Z/quickxml_to_serde.git", version = "0.6.1" } -version = { package = "komorebi-version", path = "../../crates/komorebi-version" } +version = { package = "komorebi-version", path = "../crates/komorebi-version" } base64 = "0.22" block2 = "0.6" diff --git a/komorebic/Cargo.toml b/komorebic/Cargo.toml index 3734f5ec..09eba98c 100644 --- a/komorebic/Cargo.toml +++ b/komorebic/Cargo.toml @@ -40,8 +40,8 @@ win-msgbox = "0.2" windows = { workspace = true } [target.'cfg(target_os = "linux")'.dependencies] -komorebi-linux = { package = "komorebi-linux", path = "../komorebi-for-kde/komorebi", default-features = false } -komorebi-hotkeys = { path = "../komorebi-for-kde/komorebi-hotkeys" } +komorebi-linux = { package = "komorebi-linux", path = "../komorebi-linux", default-features = false } +komorebi-hotkeys = { path = "../komorebi-hotkeys" } version = { package = "komorebi-version", path = "../crates/komorebi-version" } clap_complete = "4" sysinfo = "0.40"