Split deucalion into workspaces

ff14wed · Jul 4, 2024 · 6f85738 · 6f85738
1 parent 6c072da
commit 6f85738
Show file tree

Hide file tree

Showing 18 changed files with 96 additions and 70 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,70 +1,4 @@
-[package]
-name = "deucalion"
-version = "1.0.0"
-authors = ["ff14wed"]
-edition = "2021"
-build = "build.rs"
-license = "GPL-3.0"
-description = "High-performance Windows library for capturing decoded FFXIV packets."
-homepage = "https://github.com/ff14wed/deucalion"
-repository = "https://github.com/ff14wed/deucalion"
-readme = "README.md"
-keywords = ["ffxiv", "windows", "dll-injection", "dll"]
+[workspace]
+resolver = "2"
 
-[package.metadata.winres]
-OriginalFilename = "deucalion.dll"
-CompanyName = "Flawed"
-LegalCopyright = "Copyright (C) Flawed"
-
-[package.metadata.docs.rs]
-default-target = "x86_64-pc-windows-msvc"
-targets = ["x86_64-pc-windows-msvc"]
-
-[lib]
-name = "deucalion"
-crate-type = ["rlib", "dylib"]
-
-[dependencies]
-tokio = { version = "1.38.0", features = [
-  "io-util",
-  "sync",
-  "rt",
-  "rt-multi-thread",
-  "net",
-  "time",
-  "macros",
-] }
-tokio-util = { version = "0.7.11", features = ["codec", "compat"] }
-futures = "0.3"
-anyhow = "1.0"
-thiserror = "1.0"
-bytes = "1"
-stream-cancel = "0.8.2"
-log = "0.4"
-simplelog = "0.12"
-retour = { version = "0.3", features = ["static-detour"] }
-parking_lot = "0.12"
-pelite = "0.10"
-memchr = "2"
-once_cell = "1.19"
-binary-layout = "3.2"
-dirs = "5.0"
-strum = "0.26"
-strum_macros = "0.26"
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = [
-  "minwindef",
-  "minwinbase",
-  "processthreadsapi",
-  "libloaderapi",
-  "consoleapi",
-  "wincon",
-] }
-
-[dev-dependencies]
-ntest = "*"
-rand = "0.8.5"
-
-[build-dependencies]
-winres = "0.1"
+members = ["deucalion", "deucalion-extras"]
diff --git a/deucalion-extras/Cargo.toml b/deucalion-extras/Cargo.toml
@@ -0,0 +1,22 @@
+
+[package]
+name = "deucalion-extras"
+version = "1.0.0"
+authors = ["ff14wed"]
+edition = "2021"
+license = "GPL-3.0"
+description = "Various utilities for manual validation of deucalion."
+homepage = "https://github.com/ff14wed/deucalion"
+repository = "https://github.com/ff14wed/deucalion"
+readme = "README.md"
+keywords = ["ffxiv", "windows", "dll-injection", "dll"]
+
+[dependencies]
+deucalion = { path = "../deucalion" }
+tokio = { version = "1.38.0", features = ["rt", "macros"] }
+tokio-util = { version = "0.7.11", features = ["codec", "compat"] }
+futures = "0.3"
+anyhow = "1.0"
+log = "0.4"
+simplelog = "0.12"
+pelite = "0.10"
diff --git a/src/bin/README.md → deucalion-extras/README.md b/src/bin/README.md → deucalion-extras/README.md
@@ -1,6 +1,6 @@
 # Various Scripts
 
-This folder contains a bunch of scripts for development purposes.
+This crate contains a bunch of scripts for development purposes.
 Run them from the repo root folder with `cargo run --bin ${SCRIPT_NAME}`
 or compile them if you want.
 

diff --git a/src/bin/find_sig_matches.rs → deucalion-extras/src/bin/find_sig_matches.rs b/src/bin/find_sig_matches.rs → deucalion-extras/src/bin/find_sig_matches.rs
diff --git a/src/bin/signal_exit.rs → deucalion-extras/src/bin/signal_exit.rs b/src/bin/signal_exit.rs → deucalion-extras/src/bin/signal_exit.rs
diff --git a/deucalion/Cargo.toml b/deucalion/Cargo.toml
@@ -0,0 +1,70 @@
+[package]
+name = "deucalion"
+version = "1.0.0"
+authors = ["ff14wed"]
+edition = "2021"
+build = "build.rs"
+license = "GPL-3.0"
+description = "High-performance Windows library for capturing decoded FFXIV packets."
+homepage = "https://github.com/ff14wed/deucalion"
+repository = "https://github.com/ff14wed/deucalion"
+readme = "README.md"
+keywords = ["ffxiv", "windows", "dll-injection", "dll"]
+
+[package.metadata.winres]
+OriginalFilename = "deucalion.dll"
+CompanyName = "Flawed"
+LegalCopyright = "Copyright (C) Flawed"
+
+[package.metadata.docs.rs]
+default-target = "x86_64-pc-windows-msvc"
+targets = ["x86_64-pc-windows-msvc"]
+
+[lib]
+name = "deucalion"
+crate-type = ["rlib", "dylib"]
+
+[dependencies]
+tokio = { version = "1.38.0", features = [
+  "io-util",
+  "sync",
+  "rt",
+  "rt-multi-thread",
+  "net",
+  "time",
+  "macros",
+] }
+tokio-util = { version = "0.7.11", features = ["codec", "compat"] }
+futures = "0.3"
+anyhow = "1.0"
+thiserror = "1.0"
+bytes = "1"
+stream-cancel = "0.8.2"
+log = "0.4"
+simplelog = "0.12"
+retour = { version = "0.3", features = ["static-detour"] }
+parking_lot = "0.12"
+pelite = "0.10"
+memchr = "2"
+once_cell = "1.19"
+binary-layout = "3.2"
+dirs = "5.0"
+strum = "0.26"
+strum_macros = "0.26"
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3", features = [
+  "minwindef",
+  "minwinbase",
+  "processthreadsapi",
+  "libloaderapi",
+  "consoleapi",
+  "wincon",
+] }
+
+[dev-dependencies]
+ntest = "*"
+rand = "0.8.5"
+
+[build-dependencies]
+winres = "0.1"
diff --git a/build.rs → deucalion/build.rs b/build.rs → deucalion/build.rs
diff --git a/src/hook/mod.rs → deucalion/src/hook/mod.rs b/src/hook/mod.rs → deucalion/src/hook/mod.rs
diff --git a/src/hook/packet.rs → deucalion/src/hook/packet.rs b/src/hook/packet.rs → deucalion/src/hook/packet.rs
diff --git a/src/hook/recv.rs → deucalion/src/hook/recv.rs b/src/hook/recv.rs → deucalion/src/hook/recv.rs
diff --git a/src/hook/send.rs → deucalion/src/hook/send.rs b/src/hook/send.rs → deucalion/src/hook/send.rs
diff --git a/src/hook/send_lobby.rs → deucalion/src/hook/send_lobby.rs b/src/hook/send_lobby.rs → deucalion/src/hook/send_lobby.rs
diff --git a/src/hook/waitgroup.rs → deucalion/src/hook/waitgroup.rs b/src/hook/waitgroup.rs → deucalion/src/hook/waitgroup.rs
diff --git a/src/lib.rs → deucalion/src/lib.rs b/src/lib.rs → deucalion/src/lib.rs
diff --git a/src/namedpipe.rs → deucalion/src/namedpipe.rs b/src/namedpipe.rs → deucalion/src/namedpipe.rs
diff --git a/src/procloader.rs → deucalion/src/procloader.rs b/src/procloader.rs → deucalion/src/procloader.rs
diff --git a/src/rpc.rs → deucalion/src/rpc.rs b/src/rpc.rs → deucalion/src/rpc.rs
diff --git a/src/server.rs → deucalion/src/server.rs b/src/server.rs → deucalion/src/server.rs