From 02985999fdf2011dfe3f826df80f71665d93fc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Liebau?= Date: Tue, 14 Feb 2023 21:45:10 +0100 Subject: [PATCH] Changes to become compatible with crate2nix --- rust/operator-binary/build.rs | 12 +++++++++++- rust/operator-binary/src/main.rs | 11 ++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/rust/operator-binary/build.rs b/rust/operator-binary/build.rs index d8f91cb9..ed36fcf0 100644 --- a/rust/operator-binary/build.rs +++ b/rust/operator-binary/build.rs @@ -1,3 +1,13 @@ +use std::path::PathBuf; + fn main() { - built::write_built_file().expect("Failed to acquire build-time information"); + let out_dir = PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR is required")); + built::write_built_file_with_opts( + // built's env module depends on a whole bunch of variables that crate2nix doesn't provide + // so we grab the specific env variables that we care about out ourselves instead. + built::Options::default().set_env(false), + "Cargo.toml".as_ref(), + &out_dir.join("built.rs"), + ) + .unwrap(); } diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index 3b1c670f..f6160fd9 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -4,7 +4,7 @@ mod spark_k8s_controller; use std::sync::Arc; -use clap::Parser; +use clap::{crate_description, crate_version, Parser}; use futures::StreamExt; use stackable_operator::cli::{Command, ProductOperatorRun}; use stackable_operator::k8s_openapi::api::apps::v1::StatefulSet; @@ -24,10 +24,11 @@ use tracing_futures::Instrument; mod built_info { include!(concat!(env!("OUT_DIR"), "/built.rs")); + pub const TARGET_PLATFORM: Option<&str> = option_env!("TARGET"); } #[derive(Parser)] -#[clap(about = built_info::PKG_DESCRIPTION, author = stackable_operator::cli::AUTHOR)] +#[clap(about, author)] struct Opts { #[clap(subcommand)] cmd: Command, @@ -52,10 +53,10 @@ async fn main() -> anyhow::Result<()> { tracing_target, ); stackable_operator::utils::print_startup_string( - built_info::PKG_DESCRIPTION, - built_info::PKG_VERSION, + crate_description!(), + crate_version!(), built_info::GIT_VERSION, - built_info::TARGET, + built_info::TARGET_PLATFORM.unwrap_or("unknown target"), built_info::BUILT_TIME_UTC, built_info::RUSTC_VERSION, );