Revert "encode nightly version, commit, date into binary"

This reverts commit 89e9f85.

Author: extrawurst

Cargo.lock

@@ -12,7 +12,6 @@ readme = "README.md"
 license = "MIT"
 categories = ["command-line-utilities"]
 keywords = ["git", "gui", "cli", "terminal", "ui"]
-build = "build.rs"
 
 [dependencies]
 anyhow = "1.0"
@@ -65,9 +64,6 @@ which = "6.0"
 pretty_assertions = "1.4"
 tempfile = "3"
 
-[build-dependencies]
-compile-time = "0.2"
-
 [badges]
 maintenance = { status = "actively-developed" }
 

Cargo.toml

@@ -16,7 +16,7 @@ debug:
 	RUST_BACKTRACE=true cargo run --features=timing -- ${ARGS}
 
 build-release:
-	GITUI_RELEASE=1 cargo build --release --locked
+	cargo build --release --locked
 
 release-mac: build-release
 	strip target/release/gitui
@@ -42,7 +42,7 @@ build-linux-musl-debug:
 	cargo build --target=x86_64-unknown-linux-musl
 
 build-linux-musl-release:
-	GITUI_RELEASE=1 cargo build --release --target=x86_64-unknown-linux-musl
+	cargo build --release --target=x86_64-unknown-linux-musl
 
 test-linux-musl:
 	cargo test --workspace --target=x86_64-unknown-linux-musl
@@ -64,9 +64,9 @@ build-linux-arm-debug:
 	cargo build --target=arm-unknown-linux-gnueabihf
 
 build-linux-arm-release:
-	GITUI_RELEASE=1 cargo build --release --target=aarch64-unknown-linux-gnu
-	GITUI_RELEASE=1 cargo build --release --target=armv7-unknown-linux-gnueabihf
-	GITUI_RELEASE=1 cargo build --release --target=arm-unknown-linux-gnueabihf
+	cargo build --release --target=aarch64-unknown-linux-gnu
+	cargo build --release --target=armv7-unknown-linux-gnueabihf
+	cargo build --release --target=arm-unknown-linux-gnueabihf
 
 test:
 	cargo test --workspace
@@ -100,4 +100,4 @@ licenses:
 	cargo bundle-licenses --format toml --output THIRDPARTY.toml
 
 clean:
-	cargo clean
+	cargo clean

Makefile

@@ -2,7 +2,7 @@ use crate::bug_report;
 use anyhow::{anyhow, Result};
 use asyncgit::sync::RepoPath;
 use clap::{
-	crate_authors, crate_description, crate_name, Arg,
+	crate_authors, crate_description, crate_name, crate_version, Arg,
 	Command as ClapApp,
 };
 use simplelog::{Config, LevelFilter, WriteLogger};
@@ -63,7 +63,7 @@ pub fn process_cmdline() -> Result<CliArgs> {
 fn app() -> ClapApp {
 	ClapApp::new(crate_name!())
 		.author(crate_authors!())
-		.version(env!("GITUI_BUILD_NAME"))
+		.version(crate_version!())
 		.about(crate_description!())
 		.help_template(
 			"\

build.rs

@@ -43,6 +43,7 @@ mod string_utils;
 mod strings;
 mod tabs;
 mod ui;
+mod version;
 mod watcher;
 
 use crate::{app::App, args::process_cmdline};

src/args.rs

@@ -6,6 +6,7 @@ use crate::{
 	app::Environment,
 	keys::{key_match, SharedKeyConfig},
 	strings, ui,
+	version::Version,
 };
 use anyhow::Result;
 use asyncgit::hash;
@@ -69,10 +70,7 @@ impl DrawableComponent for HelpPopup {
 
 			f.render_widget(
 				Paragraph::new(Line::from(vec![Span::styled(
-					Cow::from(format!(
-						"gitui {}",
-						env!("GITUI_BUILD_NAME"),
-					)),
+					Cow::from(format!("gitui {}", Version::new(),)),
 					Style::default(),
 				)]))
 				.alignment(Alignment::Right),

src/main.rs

@@ -0,0 +1,35 @@
+use std::{env, fmt};
+
+/// version type
+#[derive(Default)]
+pub struct Version {
+	major: u32,
+	minor: u32,
+	patch: u32,
+}
+
+impl Version {
+	/// read version at compile time from env variables
+	pub fn new() -> Self {
+		let mut res = Self::default();
+		let major_str = env!("CARGO_PKG_VERSION_MAJOR");
+		if let Ok(major) = major_str.parse::<u32>() {
+			res.major = major;
+		}
+		let minor_str = env!("CARGO_PKG_VERSION_MINOR");
+		if let Ok(minor) = minor_str.parse::<u32>() {
+			res.minor = minor;
+		}
+		let patch_str = env!("CARGO_PKG_VERSION_PATCH");
+		if let Ok(patch) = patch_str.parse::<u32>() {
+			res.patch = patch;
+		}
+		res
+	}
+}
+
+impl fmt::Display for Version {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		write!(f, "v{}.{}.{}", self.major, self.minor, self.patch)
+	}
+}