Add extended version information to wasmtime --version

build.rs

@@ -13,6 +13,8 @@ use std::process::Command;
 fn main() -> anyhow::Result<()> {
     println!("cargo:rerun-if-changed=build.rs");
 
+    set_commit_info_for_rustc();
+
     let out_dir = PathBuf::from(
         env::var_os("OUT_DIR").expect("The OUT_DIR environment variable must be set"),
     );
@@ -281,3 +283,30 @@ fn ignore(testsuite: &str, testname: &str, strategy: &str) -> bool {
         _ => false,
     }
 }
+
+fn set_commit_info_for_rustc() {
+    if !Path::new(".git").exists() {
+        return;
+    }
+    let output = match Command::new("git")
+        .arg("log")
+        .arg("-1")
+        .arg("--date=short")
+        .arg("--format=%H %h %cd")
+        .arg("--abbrev=9")
+        .output()
+    {
+        Ok(output) if output.status.success() => output,
+        _ => return,
+    };
+    let stdout = String::from_utf8(output.stdout).unwrap();
+    let mut parts = stdout.split_whitespace();
+    let mut next = || parts.next().unwrap();
+    println!("cargo:rustc-env=WASMTIME_GIT_HASH={}", next());
+    println!(
+        "cargo:rustc-env=WASMTIME_VERSION_INFO={} ({} {})",
+        env!("CARGO_PKG_VERSION"),
+        next(),
+        next()
+    );
+}

src/bin/wasmtime.rs

@@ -9,7 +9,7 @@ use clap::Parser;
 /// Wasmtime WebAssembly Runtime
 #[derive(Parser, PartialEq)]
 #[clap(
-    version,
+    version = version(),
     after_help = "If a subcommand is not provided, the `run` subcommand will be used.\n\
                   \n\
                   Usage examples:\n\
@@ -40,6 +40,11 @@ struct Wasmtime {
     run: wasmtime_cli::commands::RunCommand,
 }
 
+/// If WASMTIME_VERSION_INFO is set, use it, otherwise use CARGO_PKG_VERSION.
+fn version() -> &'static str {
+    option_env!("WASMTIME_VERSION_INFO").unwrap_or(env!("CARGO_PKG_VERSION"))
+}
+
 #[derive(Parser, PartialEq)]
 enum Subcommand {
     /// Runs a WebAssembly module