Merge pull request #27 from iawia002/version-info

Customize the version information output for CLI

wacker-cli/build.rs

@@ -0,0 +1,26 @@
+use std::process::Command;
+
+fn main() {
+    set_commit_info_for_rustc();
+}
+
+fn set_commit_info_for_rustc() {
+    let output = match Command::new("git")
+        .arg("log")
+        .arg("-1")
+        .arg("--date=short")
+        .arg("--format=%H %h %cd")
+        .output()
+    {
+        // Something like: 1d3b80a2765e46a51290819b82f772dff09c2c49 1d3b80a 2023-12-21
+        Ok(output) if output.status.success() => String::from_utf8(output.stdout).unwrap(),
+        _ => return,
+    };
+    let mut parts = output.split_whitespace().skip(1);
+    println!(
+        "cargo:rustc-env=WACKER_VERSION_INFO={} ({} {})",
+        env!("CARGO_PKG_VERSION"),
+        parts.next().unwrap(),
+        parts.next().unwrap()
+    );
+}

wacker-cli/src/main.rs

@@ -6,12 +6,17 @@ use wacker::new_client;
 
 #[derive(Parser)]
 #[command(name = "wacker")]
-#[command(author, version, about, long_about = None)]
+#[command(author, version = version(), about, long_about = None)]
 struct Wacker {
     #[command(subcommand)]
     subcommand: Subcommand,
 }
 
+fn version() -> &'static str {
+    // If WACKER_VERSION_INFO is set, use it, otherwise use CARGO_PKG_VERSION.
+    option_env!("WACKER_VERSION_INFO").unwrap_or(env!("CARGO_PKG_VERSION"))
+}
+
 #[derive(Parser)]
 enum Subcommand {
     /// Runs a WebAssembly module

wacker-daemon/build.rs

@@ -0,0 +1,26 @@
+use std::process::Command;
+
+fn main() {
+    set_commit_info_for_rustc();
+}
+
+fn set_commit_info_for_rustc() {
+    let output = match Command::new("git")
+        .arg("log")
+        .arg("-1")
+        .arg("--date=short")
+        .arg("--format=%H %h %cd")
+        .output()
+    {
+        // Something like: 1d3b80a2765e46a51290819b82f772dff09c2c49 1d3b80a 2023-12-21
+        Ok(output) if output.status.success() => String::from_utf8(output.stdout).unwrap(),
+        _ => return,
+    };
+    let mut parts = output.split_whitespace().skip(1);
+    println!(
+        "cargo:rustc-env=WACKER_VERSION_INFO={} ({} {})",
+        env!("CARGO_PKG_VERSION"),
+        parts.next().unwrap(),
+        parts.next().unwrap()
+    );
+}

wacker-daemon/src/main.rs

@@ -12,9 +12,14 @@ use wacker::{Config, ModulesServer, Server};
 
 #[derive(Parser)]
 #[command(name = "wackerd")]
-#[command(author, version, about, long_about = None)]
+#[command(author, version = version(), about, long_about = None)]
 struct WackerDaemon {}
 
+fn version() -> &'static str {
+    // If WACKER_VERSION_INFO is set, use it, otherwise use CARGO_PKG_VERSION.
+    option_env!("WACKER_VERSION_INFO").unwrap_or(env!("CARGO_PKG_VERSION"))
+}
+
 impl WackerDaemon {
     async fn execute(self) -> Result<()> {
         let config = Config::new()?;

wacker/Cargo.toml

@@ -33,4 +33,5 @@ const_format = "0.2.32"
 async-stream = "0.3.5"
 
 [build-dependencies]
+anyhow.workspace = true
 tonic-build = "0.10.2"

wacker/build.rs

@@ -1,4 +1,6 @@
-fn main() -> Result<(), Box<dyn std::error::Error>> {
+use anyhow::Result;
+
+fn main() -> Result<()> {
     tonic_build::compile_protos("proto/module.proto")?;
     Ok(())
 }