diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 45781f4..35751e8 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -20,7 +20,7 @@ image = { version = "0.25", default-features = false, features = ["png"] } clap = { version = "4.5", features = ["derive", "error-context"] } [build-dependencies] -vergen-git2 = { version = "1.0", features = ["build", "cargo", "rustc", "si"] } +vergen-gix = { version = "1.0", features = ["build", "cargo", "rustc", "si"] } [lints] workspace = true diff --git a/utils/build.rs b/utils/build.rs index 25c9a37..776aa2f 100644 --- a/utils/build.rs +++ b/utils/build.rs @@ -1,23 +1,17 @@ -use vergen_git2::{BuildBuilder, CargoBuilder, Emitter, Git2Builder, RustcBuilder, SysinfoBuilder}; +use vergen_gix::{BuildBuilder, CargoBuilder, Emitter, GixBuilder, RustcBuilder, SysinfoBuilder}; fn main() { let build = BuildBuilder::all_build().unwrap(); let cargo = CargoBuilder::all_cargo().unwrap(); - let git2 = Git2Builder::all_git().unwrap(); + let gitcl = GixBuilder::all_git().unwrap(); let rustc = RustcBuilder::all_rustc().unwrap(); let si = SysinfoBuilder::all_sysinfo().unwrap(); Emitter::default() - .add_instructions(&build) - .unwrap() - .add_instructions(&cargo) - .unwrap() - .add_instructions(&git2) - .unwrap() - .add_instructions(&rustc) - .unwrap() - .add_instructions(&si) - .unwrap() - .emit() - .unwrap(); + .add_instructions(&build).unwrap() + .add_instructions(&cargo).unwrap() + .add_instructions(&gitcl).unwrap() + .add_instructions(&rustc).unwrap() + .add_instructions(&si).unwrap() + .emit().unwrap(); } diff --git a/utils/src/bin/czutil.rs b/utils/src/bin/czutil.rs index 0c27d77..8d85fc7 100644 --- a/utils/src/bin/czutil.rs +++ b/utils/src/bin/czutil.rs @@ -72,11 +72,12 @@ fn main() { if cli.version { println!( - "{}, {} v{}-{}", + "{}, {} v{}-{} ({})", env!("CARGO_BIN_NAME"), env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"), - &env!("VERGEN_GIT_SHA")[0..=6] + &env!("VERGEN_GIT_SHA")[0..=6], + env!("VERGEN_GIT_COMMIT_DATE"), ); exit(0); } diff --git a/utils/src/bin/pakutil.rs b/utils/src/bin/pakutil.rs index bbf1148..1557cb5 100644 --- a/utils/src/bin/pakutil.rs +++ b/utils/src/bin/pakutil.rs @@ -65,11 +65,12 @@ fn main() { if cli.version { println!( - "{}, {} v{}-{}", + "{}, {} v{}-{} ({})", env!("CARGO_BIN_NAME"), env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"), - &env!("VERGEN_GIT_SHA")[0..=6] + &env!("VERGEN_GIT_SHA")[0..=6], + env!("VERGEN_GIT_COMMIT_DATE"), ); exit(0); }