Merge pull request #49 from messense/metadata

Add `cargo-zigbuild metadata` subcommand

.github/workflows/CI.yml

@@ -36,11 +36,11 @@ jobs:
  fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
  matrix:
  os: [ubuntu-latest, macos-latest, windows-latest]
- toolchain: [1.56.1, stable, nightly]
+ toolchain: [1.57.0, stable, nightly]
  zig: [0.9.1, master]
  exclude:
  # Only test MSRV with zig stable version
- - toolchain: 1.56.1
+ - toolchain: 1.57.0
  zig: master
  steps:
  - uses: actions/checkout@v3

Cargo.toml

@@ -17,7 +17,7 @@ cargo_metadata = "0.15.0"
 clap = { version = "3.1.2", features = ["derive", "env", "wrap_help"] }
 dirs = "4.0.0"
 fs-err = "2.6.0"
-path-slash = "0.1.4"
+path-slash = "0.2.0"
 rustc_version = "0.4.0"
 semver = "1.0.5"
 serde = { version = "1.0.136", features = ["derive"] }

src/bin/cargo-zigbuild.rs

@@ -1,3 +1,5 @@
+use anyhow::Context;
+use cargo_options::Metadata;
 use cargo_zigbuild::{Build, Run, Rustc, Test, Zig};
 use clap::Parser;
 
@@ -11,6 +13,8 @@ use clap::Parser;
 pub enum Opt {
  #[clap(name = "zigbuild", aliases = &["build", "b"] )]
  Build(Build),
+ #[clap(name = "metadata")]
+ Metadata(Metadata),
  #[clap(name = "rustc")]
  Rustc(Rustc),
  #[clap(name = "run", alias = "r")]
@@ -25,6 +29,16 @@ fn main() -> anyhow::Result<()> {
  let opt = Opt::parse();
  match opt {
  Opt::Build(build) => build.execute()?,
+ Opt::Metadata(metadata) => {
+ let mut cmd = metadata.command();
+ let mut child = cmd.spawn().context("Failed to run cargo metadata")?;
+ let status = child
+ .wait()
+ .expect("Failed to wait on cargo metadata process");
+ if !status.success() {
+ std::process::exit(status.code().unwrap_or(1));
+ }
+ }
  Opt::Rustc(rustc) => rustc.execute()?,
  Opt::Run(run) => run.execute()?,
  Opt::Test(test) => test.execute()?,

src/zig.rs

@@ -309,11 +309,11 @@ impl Zig {
  let (zig_cc, zig_cxx) = prepare_zig_linker(raw_target)?;
  if is_mingw_shell() {
  let zig_cc = zig_cc.to_slash_lossy();
- cmd.env(format!("CC_{}", env_target), &zig_cc);
- cmd.env(format!("CXX_{}", env_target), &zig_cxx.to_slash_lossy());
+ cmd.env(format!("CC_{}", env_target), &*zig_cc);
+ cmd.env(format!("CXX_{}", env_target), &*zig_cxx.to_slash_lossy());
  cmd.env(
  format!("CARGO_TARGET_{}_LINKER", env_target.to_uppercase()),
- &zig_cc,
+ &*zig_cc,
  );
  } else {
  cmd.env(format!("CC_{}", env_target), &zig_cc);
@@ -565,7 +565,7 @@ fn write_linker_wrapper(path: &Path, command: &str, args: &str) -> Result<()> {
  env::current_exe()?
  };
  let current_exe = if is_mingw_shell() {
- current_exe.to_slash_lossy()
+ current_exe.to_slash_lossy().to_string()
  } else {
  current_exe.display().to_string()
  };