Divide project into library and binary parts

Author: tuguzT

Cargo.lock

@@ -1,17 +1,25 @@
 [workspace]
 members = [
 	"crates/cargo-gpu",
+	"crates/cargo-gpu-cli",
 	"crates/xtask",
 ]
 
 exclude = [
 	# This currently needs to be excluded because it depends on a version of `rust-gpu` that
-	# uses a toolchain whose Cargo version doesn't recognise version 4 of `Cargo.lock`.
-	"crates/shader-crate-template"
+	# uses a toolchain whose Cargo version doesn't recognize version 4 of `Cargo.lock`.
+	"crates/shader-crate-template",
 ]
 
 resolver = "2"
 
+[workspace.package]
+version = "0.1.0"
+edition = "2021"
+repository = "https://github.com/Rust-GPU/cargo-gpu"
+keywords = ["gpu", "compiler", "rust-gpu"]
+license = "MIT OR Apache-2.0"
+
 [workspace.dependencies]
 spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "3df836eb9d7b01344f52737bf9a310d1fb5a0c26", default-features = false }
 anyhow = "1.0.98"

Cargo.toml

@@ -9,7 +9,7 @@ Command line tool for building Rust shaders using rust-gpu.
 To install the tool ensure you have `rustup`. Then run:
 
 ```
-cargo install --git https://github.com/rust-gpu/cargo-gpu cargo-gpu
+cargo install --git https://github.com/rust-gpu/cargo-gpu cargo-gpu-cli
 ```
 
 After that you can use `cargo gpu` to compile your shader crates with:

README.md

@@ -0,0 +1,24 @@
+[package]
+name = "cargo-gpu-cli"
+description = "Command line tool for building Rust shaders using `rust-gpu`"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+keywords.workspace = true
+license.workspace = true
+
+default-run = "cargo-gpu"
+
+[[bin]]
+name = "cargo-gpu"
+path = "src/main.rs"
+
+[dependencies]
+cargo-gpu = { path = "../cargo-gpu" }
+clap.workspace = true
+log.workspace = true
+env_logger.workspace = true
+anyhow.workspace = true
+
+[lints]
+workspace = true

crates/cargo-gpu-cli/Cargo.toml

@@ -1,14 +1,12 @@
 [package]
 name = "cargo-gpu"
-version = "0.1.0"
-edition = "2021"
-description = "Generates shader .spv files from rust-gpu shader crates"
-repository = "https://github.com/Rust-GPU/cargo-gpu"
+description = "Generates shader .spv files from `rust-gpu` shader crates"
 readme = "../../README.md"
-keywords = ["gpu", "compiler", "rust-gpu"]
-license = "MIT OR Apache-2.0"
-default-run = "cargo-gpu"
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+keywords.workspace = true
+license.workspace = true
 
 [dependencies]
 cargo_metadata.workspace = true
@@ -17,7 +15,6 @@ spirv-builder = { workspace = true, features = ["clap", "watch"] }
 legacy_target_specs.workspace = true
 clap.workspace = true
 directories.workspace = true
-env_logger.workspace = true
 log.workspace = true
 relative-path.workspace = true
 serde.workspace = true

crates/cargo-gpu/src/main.rs renamed to crates/cargo-gpu-cli/src/main.rs

@@ -140,15 +140,13 @@ impl Command {
                     config::Config::clap_command_with_cargo_config(shader_crate_path, env_args)?;
                 log::debug!("building with final merged arguments: {command:#?}");
 
+                //  When watching, do one normal run to setup the `manifest.json` file.
                 if command.build.watch {
-                    //  When watching, do one normal run to setup the `manifest.json` file.
                     command.build.watch = false;
                     command.run()?;
                     command.build.watch = true;
-                    command.run()?;
-                } else {
-                    command.run()?;
                 }
+                command.run()?;
             }
             Self::Show(show) => show.run()?,
             Self::DumpUsage => dump_full_usage_for_readme()?,

crates/cargo-gpu/Cargo.toml

@@ -149,7 +149,7 @@ fn main() {
             rust_gpu_version: maybe_rust_gpu_version,
         } => {
             log::info!("installing cargo gpu");
-            cmd(["cargo", "install", "--path", "crates/cargo-gpu"]).unwrap();
+            cmd(["cargo", "install", "--path", "crates/cargo-gpu-cli"]).unwrap();
 
             log::info!("setup project");
             let dir = tempdir::TempDir::new("test-shader-output").unwrap();