From b374947b45ddd44d0d565a8028b336eab1b8316f Mon Sep 17 00:00:00 2001
From: Julian Orth <ju.orth@gmail.com>
Date: Thu, 4 Apr 2024 15:48:36 +0200
Subject: [PATCH] all: reorganize packages for release

---
 Cargo.lock             | 18 +++++++++---------
 Cargo.toml             | 18 +++++++++++++-----
 algorithms/Cargo.toml  |  6 +++---
 jay-config/Cargo.toml  |  1 +
 src/cli/screenshot.rs  |  2 +-
 src/rect.rs            |  2 +-
 src/rect/region.rs     |  2 +-
 src/rect/tests.rs      |  2 +-
 toml-config/Cargo.toml |  2 ++
 9 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3c72f148..4cdd16c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,13 +39,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "algorithms"
-version = "0.1.0"
-dependencies = [
- "smallvec",
-]
-
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -500,11 +493,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
-name = "jay"
+name = "jay-algorithms"
+version = "0.1.0"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "jay-compositor"
 version = "0.1.0"
 dependencies = [
  "ahash",
- "algorithms",
  "anyhow",
  "arrayvec",
  "ash",
@@ -523,6 +522,7 @@ dependencies = [
  "humantime",
  "indexmap",
  "isnt",
+ "jay-algorithms",
  "jay-config",
  "jay-toml-config",
  "libloading 0.8.1",
diff --git a/Cargo.toml b/Cargo.toml
index 7bac7c86..c911769d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,15 @@
 [package]
-name = "jay"
+name = "jay-compositor"
 version = "0.1.0"
 edition = "2021"
 build = "build/build.rs"
+license = "GPL-3.0-only"
+description = "The Jay compositor"
+repository = "https://github.com/mahkoh/jay"
+
+[[bin]]
+name = "jay"
+path = "src/main.rs"
 
 [workspace]
 members = ["jay-config", "toml-config", "algorithms", "toml-spec"]
@@ -14,6 +21,10 @@ panic = "abort"
 panic = "abort"
 
 [dependencies]
+jay-config = { path = "jay-config" }
+jay-toml-config = { path = "toml-config" }
+jay-algorithms = { path = "algorithms" }
+
 uapi = "0.2.13"
 thiserror = "1.0.56"
 ahash = "0.8.7"
@@ -29,9 +40,6 @@ rand = "0.8.5"
 smallvec = { version = "1.11.1", features = ["const_generics", "const_new", "union"] }
 byteorder = "1.5.0"
 bincode = "1.3.3"
-jay-config = { path = "jay-config" }
-jay-toml-config = { path = "toml-config" }
-algorithms = { path = "algorithms" }
 pin-project = "1.1.4"
 clap = { version = "4.4.18", features = ["derive", "wrap_help"] }
 clap_complete = "4.4.10"
@@ -57,7 +65,7 @@ cc = "1.0.86"
 #[profile.dev.build-override]
 #opt-level = 3
 
-[profile.dev.package."algorithms"]
+[profile.dev.package."jay-algorithms"]
 opt-level = 3
 
 [profile.dev.package."smallvec"]
diff --git a/algorithms/Cargo.toml b/algorithms/Cargo.toml
index 7a908e8d..3bb8f64f 100644
--- a/algorithms/Cargo.toml
+++ b/algorithms/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-name = "algorithms"
+name = "jay-algorithms"
 version = "0.1.0"
 edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+license = "GPL-3.0-only"
+description = "Internal dependency of the Jay compositor"
 
 [dependencies]
 smallvec = { version = "1.8.0", features = ["const_generics", "const_new", "union"] }
diff --git a/jay-config/Cargo.toml b/jay-config/Cargo.toml
index e5bd2f87..39d1e113 100644
--- a/jay-config/Cargo.toml
+++ b/jay-config/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2021"
 license = "GPL-3.0-only"
 description = "Configuration crate for the Jay compositor"
+repository = "https://github.com/mahkoh/jay"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/src/cli/screenshot.rs b/src/cli/screenshot.rs
index 865d5646..0d8bd10a 100644
--- a/src/cli/screenshot.rs
+++ b/src/cli/screenshot.rs
@@ -14,8 +14,8 @@ use {
             jay_screenshot::{Dmabuf, Error},
         },
     },
-    algorithms::qoi::xrgb8888_encode_qoi,
     chrono::Local,
+    jay_algorithms::qoi::xrgb8888_encode_qoi,
     std::rc::Rc,
 };
 
diff --git a/src/rect.rs b/src/rect.rs
index a3031c79..c310632b 100644
--- a/src/rect.rs
+++ b/src/rect.rs
@@ -5,7 +5,7 @@ mod tests;
 
 pub use region::RegionBuilder;
 use {
-    algorithms::rect::RectRaw,
+    jay_algorithms::rect::RectRaw,
     smallvec::SmallVec,
     std::fmt::{Debug, Formatter},
 };
diff --git a/src/rect/region.rs b/src/rect/region.rs
index f004c1af..72deeba2 100644
--- a/src/rect/region.rs
+++ b/src/rect/region.rs
@@ -1,6 +1,6 @@
 use {
     crate::rect::{Rect, Region},
-    algorithms::rect::{
+    jay_algorithms::rect::{
         region::{extents, rects_to_bands, subtract, union},
         RectRaw,
     },
diff --git a/src/rect/tests.rs b/src/rect/tests.rs
index 9eb4dccf..9d46f824 100644
--- a/src/rect/tests.rs
+++ b/src/rect/tests.rs
@@ -1,6 +1,6 @@
 use {
     crate::rect::{Rect, Region},
-    algorithms::rect::RectRaw,
+    jay_algorithms::rect::RectRaw,
 };
 
 #[test]
diff --git a/toml-config/Cargo.toml b/toml-config/Cargo.toml
index a6d0c4e2..4352621e 100644
--- a/toml-config/Cargo.toml
+++ b/toml-config/Cargo.toml
@@ -2,6 +2,8 @@
 name = "jay-toml-config"
 version = "0.1.0"
 edition = "2021"
+license = "GPL-3.0-only"
+description = "Internal dependency of the Jay compositor"
 
 [lib]
 crate-type = ["lib", "cdylib"]