From bea7596209ce3cc5a12062d4525469e516a34012 Mon Sep 17 00:00:00 2001 From: parazyd Date: Thu, 3 Aug 2023 11:52:16 +0200 Subject: [PATCH] Revert "Embed git revision in CLI version output." This reverts commit 459170ff096a06e370addaf107dbe0a6e08e6d31. --- Makefile | 10 ++-------- src/lib.rs | 3 +-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index e53bc8270..6d83f1123 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,6 @@ CARGO = cargo +nightly # Uncomment this if the above is uncommented #TARGET_PRFX = --target= -# Git revision, embedded in src/lib.rs -GIT_REV = $(shell git rev-parse --short HEAD) - # Binaries to be built BINS = darkfid faucetd drk darkirc vanityaddr tau taud @@ -38,10 +35,7 @@ BINDEPS = \ all: $(BINS) -rev: - @grep -q "$(GIT_REV)" src/lib.rs || sed -e 's/@GIT_REV@/$(GIT_REV)/' -i src/lib.rs - -zkas: rev $(ZKASDEPS) +zkas: $(ZKASDEPS) $(CARGO) build $(TARGET_PRFX)$(RUST_TARGET) --all-features --release --package $@ cp -f target/$(RUST_TARGET)/release/$@ $@ @@ -107,5 +101,5 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/$$i; \ done; -.PHONY: all rev check fix fmt clippy test test-no-run cleanbin clean \ +.PHONY: all check fix fmt clippy test test-no-run cleanbin clean \ install uninstall contracts coverage diff --git a/src/lib.rs b/src/lib.rs index 2f737c9a2..6c3cdcd84 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -69,10 +69,9 @@ pub const ANSI_LOGO: &str = include_str!("../contrib/darkfi.ansi"); macro_rules! cli_desc { () => {{ let desc = format!( - "{} {}-{}\n{}\n{}", + "{} {}\n{}\n{}", env!("CARGO_PKG_NAME").to_string(), env!("CARGO_PKG_VERSION").to_string(), - "@GIT_REV@", // Only noobs will change this env!("CARGO_PKG_DESCRIPTION").to_string(), darkfi::ANSI_LOGO, );