From 660e67b7073bc4776f22c4c751125c10f69bfcea Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Sat, 31 Oct 2026 11:41:39 -0700 Subject: [PATCH] refactor(pkg): rename the Windows daemon package to komorebi-windows The package name komorebi is needed for the single komorebi binary package (Option A of docs/dev/unified-binaries.md). The daemon library becomes komorebi-windows with [lib] name and [[bin]] name unchanged (komorebi); komorebi-client uses package = ...; the version lookup in the justfile and cargo wix -p in the release workflow follow. Cargo.lock only renames one entry (checked). Not behaviour: same sources, same binary name. Gates run: fast-check --since base: Windows clippy PASS, KDE and macOS PASS, nix eval PASS. tools/e2e-needed lists the e2e binaries as affected (the closure crate's manifest changed), so the Windows e2e gate is OWED by the coordinator; the produced komorebi.exe should be unchanged code. Not run: nix builds, e2e. --- .github/workflows/windows.yaml | 2 +- Cargo.lock | 116 ++++++++++++++++----------------- deny.toml | 2 +- justfile | 2 +- komorebi-client/Cargo.toml | 2 +- komorebi/Cargo.toml | 9 ++- 6 files changed, 70 insertions(+), 63 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 77e7006e..1214a751 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -68,7 +68,7 @@ jobs: args: "--locked --release" - run: | cargo install cargo-wix - cargo wix --no-build -p komorebi --nocapture -I .\wix\main.wxs --target ${{ matrix.platform.target }} + cargo wix --no-build -p komorebi-windows --nocapture -I .\wix\main.wxs --target ${{ matrix.platform.target }} - uses: actions/upload-artifact@v7 with: name: komorebi-${{ matrix.platform.target }}-${{ github.sha }} diff --git a/Cargo.lock b/Cargo.lock index 7f617ef8..e63ce387 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3331,63 +3331,6 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" -[[package]] -name = "komorebi" -version = "0.1.42" -dependencies = [ - "base64 0.22.1", - "bitflags 2.13.2", - "chrono", - "clap", - "color-eyre", - "crossbeam-channel", - "crossbeam-utils", - "ctrlc", - "dirs 6.0.0", - "ed25519-dalek", - "hotwatch", - "komorebi-backend", - "komorebi-collections", - "komorebi-config", - "komorebi-layouts", - "komorebi-protocol", - "komorebi-scrolling", - "komorebi-themes", - "komorebi-transport", - "lazy_static", - "miow", - "nanoid", - "net2", - "os_info", - "parking_lot", - "paste", - "powershell_script", - "regex", - "reqwest", - "schemars 1.2.3", - "serde", - "serde_json_lenient", - "serde_with", - "serde_yaml 0.9.34+deprecated", - "shadow-rs", - "strum", - "sysinfo 0.39.6", - "tracing", - "tracing-appender", - "tracing-subscriber", - "uds_windows", - "uuid", - "which", - "win32-display-data", - "windows 0.62.2", - "windows-core 0.62.2", - "windows-implement 0.60.2", - "windows-interface 0.59.3", - "windows-numerics 0.3.1", - "winput", - "winreg", -] - [[package]] name = "komorebi-backend" version = "0.1.42" @@ -3467,7 +3410,7 @@ dependencies = [ name = "komorebi-client" version = "0.1.42" dependencies = [ - "komorebi", + "komorebi-windows", "serde_json_lenient", "uds_windows", ] @@ -3612,6 +3555,63 @@ dependencies = [ "uds_windows", ] +[[package]] +name = "komorebi-windows" +version = "0.1.42" +dependencies = [ + "base64 0.22.1", + "bitflags 2.13.2", + "chrono", + "clap", + "color-eyre", + "crossbeam-channel", + "crossbeam-utils", + "ctrlc", + "dirs 6.0.0", + "ed25519-dalek", + "hotwatch", + "komorebi-backend", + "komorebi-collections", + "komorebi-config", + "komorebi-layouts", + "komorebi-protocol", + "komorebi-scrolling", + "komorebi-themes", + "komorebi-transport", + "lazy_static", + "miow", + "nanoid", + "net2", + "os_info", + "parking_lot", + "paste", + "powershell_script", + "regex", + "reqwest", + "schemars 1.2.3", + "serde", + "serde_json_lenient", + "serde_with", + "serde_yaml 0.9.34+deprecated", + "shadow-rs", + "strum", + "sysinfo 0.39.6", + "tracing", + "tracing-appender", + "tracing-subscriber", + "uds_windows", + "uuid", + "which", + "win32-display-data", + "windows 0.62.2", + "windows-core 0.62.2", + "windows-implement 0.60.2", + "windows-interface 0.59.3", + "windows-numerics 0.3.1", + "winput", + "winreg", +] + [[package]] name = "komorebic" version = "0.1.42" diff --git a/deny.toml b/deny.toml index c1b6953e..e9675ed5 100644 --- a/deny.toml +++ b/deny.toml @@ -43,7 +43,7 @@ allow = [ confidence-threshold = 0.8 [[licenses.clarify]] -crate = "komorebi" +crate = "komorebi-windows" expression = "LicenseRef-Komorebi-2.0" license-files = [] diff --git a/justfile b/justfile index 8353731e..3296b7dd 100644 --- a/justfile +++ b/justfile @@ -86,7 +86,7 @@ jsonschema: cargo run --package komorebic -- application-specific-configuration-schema > schema.asc.json cargo run --package komorebi-bar -- --schema > schema.bar.json -version := `cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "komorebi") | .version'` +version := `cargo metadata --format-version 1 --no-deps | jq -r '.packages[] | select(.name == "komorebi-windows") | .version'` schemapub: rm -Force komorebi-schema diff --git a/komorebi-client/Cargo.toml b/komorebi-client/Cargo.toml index 81ac42a8..6d1ae156 100644 --- a/komorebi-client/Cargo.toml +++ b/komorebi-client/Cargo.toml @@ -6,7 +6,7 @@ edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -komorebi = { path = "../komorebi", default-features = false } +komorebi = { package = "komorebi-windows", path = "../komorebi", default-features = false } uds_windows = { workspace = true } serde_json = { workspace = true } diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml index ee512acd..8246896c 100644 --- a/komorebi/Cargo.toml +++ b/komorebi/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "komorebi" +name = "komorebi-windows" version = "0.1.42" description = "A tiling window manager for Windows" repository = "https://github.com/LGUG2Z/komorebi" @@ -77,3 +77,10 @@ schemars = [ "komorebi-layouts/schemars", "komorebi-protocol/schemars", ] + +[lib] +name = "komorebi" + +[[bin]] +name = "komorebi" +path = "src/main.rs"