Add --version flag to all CLI tools (#1203)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: kixelated

rs/moq-cli/build.rs

@@ -0,0 +1,31 @@
+use std::process::Command;
+
+fn main() {
+	println!("cargo:rerun-if-changed=../../.git/HEAD");
+	println!("cargo:rerun-if-changed=../../.git/refs/heads");
+	println!("cargo:rerun-if-changed=../../.git/refs/tags");
+	println!("cargo:rerun-if-changed=../../.git/packed-refs");
+
+	let prefix = "moq-cli-v";
+	let version = git_version(prefix).unwrap_or_else(|| env!("CARGO_PKG_VERSION").to_string());
+	println!("cargo:rustc-env=VERSION={version}");
+}
+
+fn git_version(prefix: &str) -> Option<String> {
+	let output = Command::new("git")
+		.args(["describe", "--tags", "--match", &format!("{prefix}*")])
+		.output()
+		.ok()?;
+	if !output.status.success() {
+		return None;
+	}
+	let desc = String::from_utf8(output.stdout).ok()?.trim().to_string();
+	let version = desc.strip_prefix(prefix)?;
+	// "0.7.13-3-gabcdef" → "0.7.13-abcdef" (drop count, strip 'g')
+	if let Some((base, hash)) = version.rsplit_once("-g") {
+		let base = base.rsplit_once('-').map(|(b, _)| b).unwrap_or(base);
+		Some(format!("{base}-{hash}"))
+	} else {
+		Some(version.to_string())
+	}
+}

rs/moq-cli/src/main.rs

@@ -13,6 +13,7 @@ use std::path::PathBuf;
 use url::Url;
 
 #[derive(Parser, Clone)]
+#[command(version = env!("VERSION"))]
 pub struct Cli {
 	#[command(flatten)]
 	log: moq_native::Log,

rs/moq-clock/build.rs

@@ -0,0 +1,31 @@
+use std::process::Command;
+
+fn main() {
+	println!("cargo:rerun-if-changed=../../.git/HEAD");
+	println!("cargo:rerun-if-changed=../../.git/refs/heads");
+	println!("cargo:rerun-if-changed=../../.git/refs/tags");
+	println!("cargo:rerun-if-changed=../../.git/packed-refs");
+
+	let prefix = "moq-clock-v";
+	let version = git_version(prefix).unwrap_or_else(|| env!("CARGO_PKG_VERSION").to_string());
+	println!("cargo:rustc-env=VERSION={version}");
+}
+
+fn git_version(prefix: &str) -> Option<String> {
+	let output = Command::new("git")
+		.args(["describe", "--tags", "--match", &format!("{prefix}*")])
+		.output()
+		.ok()?;
+	if !output.status.success() {
+		return None;
+	}
+	let desc = String::from_utf8(output.stdout).ok()?.trim().to_string();
+	let version = desc.strip_prefix(prefix)?;
+	// "0.10.11-3-gabcdef" → "0.10.11-abcdef" (drop count, strip 'g')
+	if let Some((base, hash)) = version.rsplit_once("-g") {
+		let base = base.rsplit_once('-').map(|(b, _)| b).unwrap_or(base);
+		Some(format!("{base}-{hash}"))
+	} else {
+		Some(version.to_string())
+	}
+}

rs/moq-clock/src/main.rs

@@ -12,6 +12,7 @@ mod clock;
 use moq_lite::*;
 
 #[derive(Parser, Clone)]
+#[command(version = env!("VERSION"))]
 pub struct Config {
 	/// Connect to the given URL starting with https://
 	#[arg(long)]

rs/moq-relay/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Luke Curley"]
 repository = "https://github.com/moq-dev/moq"
 license = "MIT OR Apache-2.0"
 
-version = "0.10.13"
+version = "0.10.14"
 edition = "2024"
 rust-version.workspace = true
 

rs/moq-relay/build.rs

@@ -0,0 +1,31 @@
+use std::process::Command;
+
+fn main() {
+	println!("cargo:rerun-if-changed=../../.git/HEAD");
+	println!("cargo:rerun-if-changed=../../.git/refs/heads");
+	println!("cargo:rerun-if-changed=../../.git/refs/tags");
+	println!("cargo:rerun-if-changed=../../.git/packed-refs");
+
+	let prefix = "moq-relay-v";
+	let version = git_version(prefix).unwrap_or_else(|| env!("CARGO_PKG_VERSION").to_string());
+	println!("cargo:rustc-env=VERSION={version}");
+}
+
+fn git_version(prefix: &str) -> Option<String> {
+	let output = Command::new("git")
+		.args(["describe", "--tags", "--match", &format!("{prefix}*")])
+		.output()
+		.ok()?;
+	if !output.status.success() {
+		return None;
+	}
+	let desc = String::from_utf8(output.stdout).ok()?.trim().to_string();
+	let version = desc.strip_prefix(prefix)?;
+	// "0.10.13-3-gabcdef" → "0.10.13-abcdef" (drop count, strip 'g')
+	if let Some((base, hash)) = version.rsplit_once("-g") {
+		let base = base.rsplit_once('-').map(|(b, _)| b).unwrap_or(base);
+		Some(format!("{base}-{hash}"))
+	} else {
+		Some(version.to_string())
+	}
+}

rs/moq-relay/src/config.rs

@@ -7,6 +7,7 @@ use crate::{AuthConfig, ClusterConfig, WebConfig};
 /// variables, or a TOML file.
 #[derive(Parser, Clone, Debug, Deserialize, Serialize, Default)]
 #[serde(deny_unknown_fields, default)]
+#[command(version = env!("VERSION"))]
 #[non_exhaustive]
 pub struct Config {
 	/// The QUIC/TLS configuration for the server.

rs/moq-token-cli/build.rs

@@ -0,0 +1,31 @@
+use std::process::Command;
+
+fn main() {
+	println!("cargo:rerun-if-changed=../../.git/HEAD");
+	println!("cargo:rerun-if-changed=../../.git/refs/heads");
+	println!("cargo:rerun-if-changed=../../.git/refs/tags");
+	println!("cargo:rerun-if-changed=../../.git/packed-refs");
+
+	let prefix = "moq-token-cli-v";
+	let version = git_version(prefix).unwrap_or_else(|| env!("CARGO_PKG_VERSION").to_string());
+	println!("cargo:rustc-env=VERSION={version}");
+}
+
+fn git_version(prefix: &str) -> Option<String> {
+	let output = Command::new("git")
+		.args(["describe", "--tags", "--match", &format!("{prefix}*")])
+		.output()
+		.ok()?;
+	if !output.status.success() {
+		return None;
+	}
+	let desc = String::from_utf8(output.stdout).ok()?.trim().to_string();
+	let version = desc.strip_prefix(prefix)?;
+	// "0.5.17-3-gabcdef" → "0.5.17-abcdef" (drop count, strip 'g')
+	if let Some((base, hash)) = version.rsplit_once("-g") {
+		let base = base.rsplit_once('-').map(|(b, _)| b).unwrap_or(base);
+		Some(format!("{base}-{hash}"))
+	} else {
+		Some(version.to_string())
+	}
+}

rs/moq-token-cli/src/main.rs

@@ -6,6 +6,7 @@ use std::{io, path::PathBuf};
 #[derive(Debug, Parser)]
 #[command(name = "moq-token")]
 #[command(about = "Generate, sign, and verify tokens for moq-relay", long_about = None)]
+#[command(version = env!("VERSION"))]
 struct Cli {
 	/// The command to execute.
 	#[command(subcommand)]