rename --force-spirv-cli-rebuild to --rebuild-codegen

Author: Firestar99

README.md

@@ -94,12 +94,15 @@ for an example.
             * If `--spirv-builder-source` is set, then this is assumed to be a Git "commitsh", such
               as a Git commit hash or a Git tag, therefore anything that `git checkout` can resolve.
   
-        --force-spirv-cli-rebuild
+        --rebuild-codegen
             Force `rustc_codegen_spirv` to be rebuilt
   
         --auto-install-rust-toolchain
             Assume "yes" to "Install Rust toolchain: [y/n]" prompt
   
+        --no-clear-target
+            Clear target dir of `rustc_codegen_spirv` build after a successful build, saves about 200MiB of disk space
+  
         --force-overwrite-lockfiles-v4-to-v3
             There is a tricky situation where a shader crate that depends on workspace config can have
             a different `Cargo.lock` lockfile version from the the workspace's `Cargo.lock`. This can
@@ -148,12 +151,15 @@ for an example.
             * If `--spirv-builder-source` is set, then this is assumed to be a Git "commitsh", such
               as a Git commit hash or a Git tag, therefore anything that `git checkout` can resolve.
   
-        --force-spirv-cli-rebuild
+        --rebuild-codegen
             Force `rustc_codegen_spirv` to be rebuilt
   
         --auto-install-rust-toolchain
             Assume "yes" to "Install Rust toolchain: [y/n]" prompt
   
+        --no-clear-target
+            Clear target dir of `rustc_codegen_spirv` build after a successful build, saves about 200MiB of disk space
+  
         --force-overwrite-lockfiles-v4-to-v3
             There is a tricky situation where a shader crate that depends on workspace config can have
             a different `Cargo.lock` lockfile version from the the workspace's `Cargo.lock`. This can

crates/cargo-gpu/src/args.rs

@@ -65,7 +65,7 @@ pub struct InstallArgs {
 
     /// Force `rustc_codegen_spirv` to be rebuilt.
     #[clap(long)]
-    pub force_spirv_cli_rebuild: bool,
+    pub rebuild_codegen: bool,
 
     /// Assume "yes" to "Install Rust toolchain: [y/n]" prompt.
     #[clap(long, action)]

crates/cargo-gpu/src/install.rs

@@ -79,7 +79,7 @@ package = "rustc_codegen_spirv"
             let path = target_spec_dir()
                 .context("creating target spec dir")?
                 .join(filename);
-            if !path.is_file() || self.spirv_install.force_spirv_cli_rebuild {
+            if !path.is_file() || self.spirv_install.rebuild_codegen {
                 let mut file = std::fs::File::create(&path)
                     .with_context(|| format!("creating file at [{}]", path.display()))?;
                 file.write_all(contents.as_bytes())
@@ -129,9 +129,8 @@ package = "rustc_codegen_spirv"
             }
         }
 
-        let skip_rebuild = !source_is_path
-            && dest_dylib_path.is_file()
-            && !self.spirv_install.force_spirv_cli_rebuild;
+        let skip_rebuild =
+            !source_is_path && dest_dylib_path.is_file() && !self.spirv_install.rebuild_codegen;
         if skip_rebuild {
             log::info!("...and so we are aborting the install step.");
         } else {

crates/shader-crate-template/Cargo.toml

@@ -86,8 +86,8 @@ manifest-file = "manifest.json"
 
 # Whether to assume "yes" to the "Install Rust toolchain: [y/n]" prompt.
 auto-install-rust-toolchain = false
-# Force `spirv-builder-cli` and `rustc_codegen_spirv` to be rebuilt.
-force-spirv-cli-rebuild = false
+# Force `rustc_codegen_spirv` to be rebuilt.
+rebuild_codegen = false
 # There is a tricky situation where a shader crate that depends on workspace config can have
 # a different `Cargo.lock` lockfile version from the the workspace's `Cargo.lock`. This can
 # prevent builds when an old Rust toolchain doesn't recognise the newer lockfile version.

crates/xtask/src/main.rs

@@ -172,7 +172,7 @@ fn main() {
                 "--shader-crate",
                 SHADER_CRATE_PATH,
                 "--auto-install-rust-toolchain",
-                "--force-spirv-cli-rebuild",
+                "--rebuild-codegen",
                 "--force-overwrite-lockfiles-v4-to-v3",
             ])
             .unwrap();