build-sys: Drop custom version glue code

It was annoying me that rust-analyzer was showing an error for our `version.rs`. Something we're doing there is wrong, maybe related to the output directory? But when I dig in a bit I don't understand how we ended up with this custom code when the clap docs show use of the `clap::crate_version` macro which looks just fine to me. Not having a `build.rs` just simplifies things. Signed-off-by: Colin Walters <[email protected]>
containers · Dec 17, 2024 · b21161b · b21161b
1 parent fa096f5
commit b21161b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -9,7 +9,6 @@ version = "1.1.3"
 # For now don't bump this above what is currently shipped in RHEL9;
 # also keep in sync with the version in cli.
 rust-version = "1.75.0"
-build = "build.rs"
 
 include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"]
 

diff --git a/lib/build.rs b/lib/build.rs
diff --git a/lib/src/cli.rs b/lib/src/cli.rs
@@ -32,8 +32,6 @@ use crate::spec::Host;
 use crate::spec::ImageReference;
 use crate::utils::sigpolicy_from_opts;
 
-include!(concat!(env!("OUT_DIR"), "/version.rs"));
-
 /// Perform an upgrade operation
 #[derive(Debug, Parser, PartialEq, Eq)]
 pub(crate) struct UpgradeOpts {
@@ -398,7 +396,7 @@ impl InternalsOpts {
 #[derive(Debug, Parser, PartialEq, Eq)]
 #[clap(name = "bootc")]
 #[clap(rename_all = "kebab-case")]
-#[clap(version,long_version=CLAP_LONG_VERSION)]
+#[clap(version,long_version=clap::crate_version!())]
 #[allow(clippy::large_enum_variant)]
 pub(crate) enum Opt {
     /// Download and queue an updated container image to apply.