G2/lbee-utils
1
0
Fork 0
mirror of https://github.com/G2-Games/lbee-utils.git synced 2025-04-19 07:12:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/G2-Games/lbee-utils

Browse source
This commit is contained in:
G2-Games 2024-11-13 10:53:17 -06:00
commit 2f881ce294
4 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/Cargo.toml
View file

@ -20,7 +20,7 @@ image = { version = "0.25", default-features = false, features = ["png"] }
clap = { version = "4.5", features = ["derive", "error-context"] } clap = { version = "4.5", features = ["derive", "error-context"] }
[build-dependencies] [build-dependencies]
vergen-git2 = { version = "1.0", features = ["build", "cargo", "rustc", "si"] } vergen-gix = { version = "1.0", features = ["build", "cargo", "rustc", "si"] }
[lints] [lints]
workspace = true workspace = true

22
utils/build.rs
View file

@ -1,23 +1,17 @@
use vergen_git2::{BuildBuilder, CargoBuilder, Emitter, Git2Builder, RustcBuilder, SysinfoBuilder}; use vergen_gix::{BuildBuilder, CargoBuilder, Emitter, GixBuilder, RustcBuilder, SysinfoBuilder};
fn main() { fn main() {
let build = BuildBuilder::all_build().unwrap(); let build = BuildBuilder::all_build().unwrap();
let cargo = CargoBuilder::all_cargo().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 rustc = RustcBuilder::all_rustc().unwrap();
let si = SysinfoBuilder::all_sysinfo().unwrap(); let si = SysinfoBuilder::all_sysinfo().unwrap();
Emitter::default() Emitter::default()
.add_instructions(&build) .add_instructions(&build).unwrap()
.unwrap() .add_instructions(&cargo).unwrap()
.add_instructions(&cargo) .add_instructions(&gitcl).unwrap()
.unwrap() .add_instructions(&rustc).unwrap()
.add_instructions(&git2) .add_instructions(&si).unwrap()
.unwrap() .emit().unwrap();
.add_instructions(&rustc)
.unwrap()
.add_instructions(&si)
.unwrap()
.emit()
.unwrap();
} }

5
utils/src/bin/czutil.rs
View file

@ -72,11 +72,12 @@ fn main() {
if cli.version { if cli.version {
println!( println!(
"{}, {} v{}-{}", "{}, {} v{}-{} ({})",
env!("CARGO_BIN_NAME"), env!("CARGO_BIN_NAME"),
env!("CARGO_PKG_NAME"), env!("CARGO_PKG_NAME"),
env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_VERSION"),
&env!("VERGEN_GIT_SHA")[0..=6] &env!("VERGEN_GIT_SHA")[0..=6],
env!("VERGEN_GIT_COMMIT_DATE"),
); );
exit(0); exit(0);
} }

5
utils/src/bin/pakutil.rs
View file

@ -65,11 +65,12 @@ fn main() {
if cli.version { if cli.version {
println!( println!(
"{}, {} v{}-{}", "{}, {} v{}-{} ({})",
env!("CARGO_BIN_NAME"), env!("CARGO_BIN_NAME"),
env!("CARGO_PKG_NAME"), env!("CARGO_PKG_NAME"),
env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_VERSION"),
&env!("VERGEN_GIT_SHA")[0..=6] &env!("VERGEN_GIT_SHA")[0..=6],
env!("VERGEN_GIT_COMMIT_DATE"),
); );
exit(0); exit(0);
} }