Switch to external crate for printing version information.

Cargo.toml

@@ -127,6 +127,7 @@ rustls = { version = "*", default-features = false, features = ["ring"] }
 serde = { version = "1.0.204", default-features = false }
 serde_json = "1.0.111"
 serde-spdx = "0.9.1"
+shadow-formatted-version = "0.1.0"
 shadow-rs = { version = "0.35.2", default-features = false }
 sha1 = "0.10.6"
 sha2 = "0.10.8"

opendut-carl/Cargo.toml

@@ -41,7 +41,8 @@ pin-project-lite = { workspace = true }
 pq-sys = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true}
+serde_json = { workspace = true }
+shadow-formatted-version = { workspace = true }
 shadow-rs = { workspace = true, default-features = true }
 tar = { workspace = true }
 tempfile = { workspace = true }

opendut-carl/src/grpc/metadata_provider.rs

@@ -30,10 +30,10 @@ impl MetadataProvider for MetadataProviderFacade {
 
         let reply = VersionResponse {
             version_info: Some(VersionInfo {
-                name: String::from(crate::app_info::CRATE_VERSION),
-                revision: String::from(crate::app_info::REVISION),
-                revision_date: String::from(crate::app_info::REVISION_DATE),
-                build_date: String::from(crate::app_info::BUILD_DATE),
+                name: String::from(crate::app_info::PKG_VERSION),
+                revision: String::from(crate::app_info::COMMIT_HASH),
+                revision_date: String::from(crate::app_info::COMMIT_DATE),
+                build_date: String::from(crate::app_info::BUILD_TIME),
             })
         };
 

opendut-carl/src/http/router/cleo.rs

@@ -11,7 +11,7 @@ pub async fn download_cleo(
     Path(architecture): Path<CleoArch>,
     State(carl_install_directory): State<CarlInstallDirectory>,
 ) -> impl IntoResponse {
-    let file_name = format!("{}-{}.tar.gz", &architecture.distribution_name(), crate::app_info::CRATE_VERSION);
+    let file_name = format!("{}-{}.tar.gz", &architecture.distribution_name(), crate::app_info::PKG_VERSION);
     let file_path = carl_install_directory.path.join(CLEO_IDENTIFIER).join(&file_name);
 
     let mut response = ServeFile::new_with_mime(file_path, &mime::APPLICATION_OCTET_STREAM)
@@ -51,7 +51,7 @@ mod test {
         let dir = temp.child(CLEO_IDENTIFIER);
         fs::create_dir_all(&dir).expect("Unable to create dir.");
 
-        let file_name = format!("{}-{}.tar.gz", &CleoArch::X86_64.distribution_name(), crate::app_info::CRATE_VERSION);
+        let file_name = format!("{}-{}.tar.gz", &CleoArch::X86_64.distribution_name(), crate::app_info::PKG_VERSION);
 
         let tar_file = dir.child(&file_name);
         File::create(&tar_file)?;

opendut-carl/src/http/router/edgar.rs

@@ -11,7 +11,7 @@ pub async fn download_edgar(
     State(carl_install_directory): State<CarlInstallDirectory>,
 ) -> impl IntoResponse {
 
-    let file_name = format!("{}-{}.tar.gz", &architecture.distribution_name(), crate::app_info::CRATE_VERSION);
+    let file_name = format!("{}-{}.tar.gz", &architecture.distribution_name(), crate::app_info::PKG_VERSION);
     let edgar_path = carl_install_directory.path.join(EDGAR_IDENTIFIER).join(&file_name);
 
     let mut response = ServeFile::new_with_mime(edgar_path, &mime::APPLICATION_OCTET_STREAM)
@@ -50,7 +50,7 @@ mod test {
         let dir = temp.child(EDGAR_IDENTIFIER);
         fs::create_dir_all(&dir).expect("Unable to create dir.");
 
-        let file_name = format!("{}-{}.tar.gz", &EdgarArch::X86_64.distribution_name(), crate::app_info::CRATE_VERSION);
+        let file_name = format!("{}-{}.tar.gz", &EdgarArch::X86_64.distribution_name(), crate::app_info::PKG_VERSION);
 
         let tar_file = dir.child(&file_name);
         File::create(&tar_file)?;

opendut-carl/src/lib.rs

@@ -25,7 +25,7 @@ use crate::startup::tls::TlsConfig;
 
 pub mod grpc;
 pub mod util;
-opendut_util::app_info!();
+shadow_rs::shadow!(app_info);
 
 mod actions;
 mod cluster;

opendut-carl/src/main.rs

@@ -1,3 +1,7 @@
+use opendut_carl::app_info;
+
+shadow_formatted_version::from_shadow!(app_info);
+
 const BANNER: &str = r"
                          _____     _______
                         |  __ \   |__   __|
@@ -16,7 +20,7 @@ const BANNER: &str = r"
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    println!("{}", opendut_carl::app_info::formatted_with_banner(BANNER));
+    println!("{BANNER}\n{version_info}", version_info=FORMATTED_VERSION);
 
     opendut_carl::create_with_telemetry(opendut_util::settings::Config::default()).await
 }

opendut-carl/src/provisioning/cleo.rs

@@ -23,7 +23,7 @@ pub fn create_cleo_install_script(
 ) -> anyhow::Result<()> {
 
     for arch in CleoArch::arch_iterator() {
-        let cleo_tar_file = carl_install_directory.join(CLEO_IDENTIFIER).join(format!("{}-{}.tar.gz", arch.distribution_name(), crate::app_info::CRATE_VERSION));
+        let cleo_tar_file = carl_install_directory.join(CLEO_IDENTIFIER).join(format!("{}-{}.tar.gz", arch.distribution_name(), crate::app_info::PKG_VERSION));
         add_file_to_archive(
             &ca,
             &cleo_tar_file,

opendut-cleo/Cargo.toml

@@ -20,6 +20,7 @@ glob = { workspace = true }
 indoc = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
+shadow-formatted-version = { workspace = true }
 shadow-rs = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }

opendut-cleo/src/main.rs

@@ -16,12 +16,13 @@ pub mod parse;
 type Error = String;
 type Result<T> = std::result::Result<T, Error>;
 
-opendut_util::app_info!();
+shadow_rs::shadow!(app_info);
+shadow_formatted_version::from_shadow!(app_info);
 
 /// CLEO is a command line tool to manage openDuT resources.
 #[derive(Parser)]
 #[command(author, about, long_about = None)]
-#[command(long_version = crate::app_info::formatted())]
+#[command(long_version = crate::FORMATTED_VERSION)]
 struct Args {
     #[command(subcommand)]
     command: Commands,

opendut-edgar/Cargo.toml

@@ -35,6 +35,7 @@ regex = { workspace = true }
 reqwest = { workspace = true }
 rtnetlink = { workspace = true }
 serde = { workspace = true, features = ["std", "derive"] }
+shadow-formatted-version = { workspace = true }
 shadow-rs = { workspace = true, default-features = true }
 sha2 = { workspace = true }
 sudo = { workspace = true }

opendut-edgar/src/cli.rs

@@ -16,7 +16,7 @@ use opendut_util::project;
 #[derive(Debug, Parser)]
 #[command(name = "opendut-edgar")]
 #[command(about = "Connect your ECU to openDuT.")]
-#[command(long_version = crate::app_info::formatted())]
+#[command(long_version = crate::FORMATTED_VERSION)]
 struct Cli {
     #[command(subcommand)]
     command: Commands,

opendut-edgar/src/lib.rs

@@ -1,4 +1,5 @@
-opendut_util::app_info!();
+shadow_rs::shadow!(app_info);
+shadow_formatted_version::from_shadow!(app_info);
 
 mod cli;
 pub use cli::cli;

opendut-edgar/src/service/start.rs

@@ -44,7 +44,7 @@ const BANNER: &str = r"
            |______|_____/ \_____/_/    \_\_|  \_\";
 
 pub async fn launch(id_override: Option<PeerId>) -> anyhow::Result<()> {
-    println!("{}", crate::app_info::formatted_with_banner(BANNER));
+    println!("{BANNER}\n{version_info}", version_info=crate::FORMATTED_VERSION);
 
     let settings_override = config::Config::builder()
         .set_override_option(settings::key::peer::id, id_override.map(|id| id.to_string()))?

opendut-edgar/src/setup/start.rs

@@ -179,7 +179,7 @@ fn determine_service_user_name() -> User {
 }
 
 fn user_confirmation(dry_run: &DryRun) -> anyhow::Result<bool> {
-    let crate_version = crate::app_info::CRATE_VERSION;
+    let crate_version = crate::app_info::PKG_VERSION;
     match dry_run {
         DryRun::No => {
             println!("This will setup EDGAR {crate_version} on your system.");

opendut-util/src/lib.rs

@@ -1,5 +1,3 @@
-pub mod app_info;
-
 #[cfg(feature = "crypto")]
 pub mod crypto;