From 72e2698ade31ebdd5acd2d920892e0f4e7735a57 Mon Sep 17 00:00:00 2001
From: Philip Craig <philipjcraig@gmail.com>
Date: Mon, 4 Mar 2024 18:32:25 +1000
Subject: [PATCH] Move rewrite-cli into rewrite (#639)

---
 crates/rewrite-cli/Cargo.toml               | 17 -----------------
 crates/rewrite/Cargo.toml                   | 14 +++++++++++++-
 crates/{rewrite-cli => rewrite}/src/main.rs |  0
 3 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 crates/rewrite-cli/Cargo.toml
 rename crates/{rewrite-cli => rewrite}/src/main.rs (100%)

diff --git a/crates/rewrite-cli/Cargo.toml b/crates/rewrite-cli/Cargo.toml
deleted file mode 100644
index 2b3c948..0000000
--- a/crates/rewrite-cli/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "object-rewrite-cli"
-version = "0.0.0"
-edition = "2021"
-description = "Rewrite object files with modifications"
-
-[dependencies]
-anyhow = "1.0.79"
-clap = { version = "4.3.24", features = ["cargo"] }
-env_logger = { version = "0.11.2", default-features = false }
-log = "0.4.20"
-memmap2 = "0.9.4"
-object-rewrite = { path = "../rewrite", features = ["logging"] }
-
-[[bin]]
-name = "object-rewrite"
-path = "src/main.rs"
diff --git a/crates/rewrite/Cargo.toml b/crates/rewrite/Cargo.toml
index 2d98fc1..1941295 100644
--- a/crates/rewrite/Cargo.toml
+++ b/crates/rewrite/Cargo.toml
@@ -9,14 +9,26 @@ features = ['doc']
 
 [dependencies]
 object = { version = "0.32", default-features = false, features = ["build", "elf"], path = "../.." }
+
+# Dependencies for the cli
+anyhow = { version = "1.0.79", optional = true }
+clap = { version = "4.3.24", features = ["cargo"], optional = true }
+env_logger = { version = "0.11.2", default-features = false, optional = true }
 log = { version = "0.4.20", optional = true }
+memmap2 = { version = "0.9.4", optional = true }
 
 [dev-dependencies]
 object-examples = { path = "../examples" }
 
 [features]
 logging = ["dep:log"]
+cli = ["logging", "dep:anyhow", "dep:clap", "dep:env_logger", "dep:memmap2"]
 
 default = []
-all = ["logging"]
+all = ["cli", "logging"]
 doc = []
+
+[[bin]]
+name = "object-rewrite"
+path = "src/main.rs"
+required-features = ["cli"]
diff --git a/crates/rewrite-cli/src/main.rs b/crates/rewrite/src/main.rs
similarity index 100%
rename from crates/rewrite-cli/src/main.rs
rename to crates/rewrite/src/main.rs