Revert "Add builder"

This reverts commit 853ecfa.

Author: thedocruby

.vscode/settings.json

@@ -1,9 +1,8 @@
 {
   "rust-analyzer.linkedProjects": [
     "./examples/shaders/Cargo.toml",
-    "./gravylib-helpers/Cargo.toml",
-    "./gravylib-macros/Cargo.toml",
-    "./gravylib-builder/Cargo.toml"
+    "./gravylib_helpers/Cargo.toml",
+    "./gravylib_macros/Cargo.toml",
   ],
   "evenbettercomments.tags": [
     {

Cargo.lock

@@ -29,8 +29,8 @@ winit = { version = "0.29", features = [
   "rwh_05" # This is to maintain support with the latest version of wgpu. Should be removed once wgpu implements rwh_06.
   ] }
 cfg-if = "1.0.0"
-gravylib-helpers = { path = "./gravylib-helpers" }
-gravylib-macros = { path = "./gravylib-macros" }
+gravylib_helpers = { path = "./gravylib_helpers" }
+gravylib_macros = { path = "./gravylib_macros" }
 structopt = "0.3"
 strum = { version = "0.25", default_features = false, features = [
   "std",
@@ -48,7 +48,7 @@ shaders = { path = "./examples/shaders" }
 
 [workspace]
 resolver = "2"
-members = ["examples/shaders", "gravylib-helpers", "gravylib-macros", "gravylib-builder"]
+members = ["examples/shaders", "gravylib_helpers", "gravylib_macros"]
 
 [[example]]
 name = "standalone"

Cargo.toml

@@ -1,56 +1,10 @@
-use spirv_builder::{SpirvBuilder, MetadataPrintout};
-
-use std::env;
 use std::error::Error;
-use std::path::PathBuf;
-
-fn main() -> Result<(), Box<dyn Error>> {
-    println!("cargo:rerun-if-changed=build.rs");
-    println!("cargo:rerun-if-env-changed=CARGO_CFG_TARGET_OS");
-    println!("cargo:rerun-if-env-changed=CARGO_CFG_TARGET_ARCH");
-    // While OUT_DIR is set for both build.rs and compiling the crate, PROFILE is only set in
-    // build.rs. So, export it to crate compilation as well.
-    let profile = env::var("PROFILE").unwrap();
-    println!("cargo:rustc-env=PROFILE={profile}");
 
-    let mut dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
-    // Strip `$profile/build/*/out`.
-    let ok = dir.ends_with("out")
-        && dir.pop()
-        && dir.pop()
-        && dir.ends_with("build")
-        && dir.pop()
-        && dir.ends_with(profile)
-        && dir.pop();
-    assert!(ok);
-    // NOTE(eddyb) this needs to be distinct from the `--target-dir` value that
-    // `spirv-builder` generates in a similar way from `$OUT_DIR` and `$PROFILE`,
-    // otherwise repeated `cargo build`s will cause build script reruns and the
-    // rebuilding of `rustc_codegen_spirv` (likely due to common proc macro deps).
-    let dir = dir.join("gravylib-builder");
-    let status = std::process::Command::new("cargo")
-        .args([
-            "run",
-            "--release",
-            "-p",
-            "gravylib-builder",
-            "--target-dir",
-        ])
-        .arg(dir)
-        .env_remove("CARGO_ENCODED_RUSTFLAGS")
-        .stderr(std::process::Stdio::inherit())
-        .stdout(std::process::Stdio::inherit())
-        .status()?;
-    if !status.success() {
-        if let Some(code) = status.code() {
-            std::process::exit(code);
-        } else {
-            std::process::exit(1);
-        }
-    }
+use spirv_builder::{SpirvBuilder, MetadataPrintout};
 
+fn main() -> Result<(), Box<dyn Error>> {
     // Internal shader-like dependencies, built alongside `gravylib`
-    SpirvBuilder::new("gravylib-helpers", "spirv-unknown-vulkan1.1")
+    SpirvBuilder::new("gravylib_helpers", "spirv-unknown-vulkan1.1")
         .print_metadata(MetadataPrintout::Full)
         .build()?;
 

build.rs

@@ -11,7 +11,7 @@ repository.workspace = true
 crate-type = ["lib", "dylib"]
 
 [dependencies]
-spirv-std.workspace = true
+spirv-std = { workspace = true }
 # use `gravylib` instead of these when creating your own shader crate
-gravylib-helpers = { path = "../../gravylib-helpers" }
-gravylib-macros = { path = "../../gravylib-macros" }
+gravylib_helpers = { path = "../../gravylib_helpers" }
+gravylib_macros = { path = "../../gravylib_macros" }

examples/shaders/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "gravylib-helpers"
+name = "gravylib_helpers"
 version = "0.1.0-alpha"
 publish = false
 authors.workspace = true
@@ -11,5 +11,5 @@ repository.workspace = true
 crate-type = ["lib", "dylib"]
 
 [dependencies]
-spirv-std.workspace = true
+spirv-std = { workspace = true }
 bytemuck = { version = "1.6.3", features = ["derive"] }