From d1550f6f8b8db57573c88ae65dcd1998d007bfc9 Mon Sep 17 00:00:00 2001 From: Sebastian Wiesner Date: Sat, 28 Dec 2024 13:30:37 +0100 Subject: [PATCH] Inject git version for devel builds --- Makefile | 3 +++ src/app.rs | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d34b0db..19e8ba7 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ BLUEPRINTS = $(wildcard ui/*.blp) UIDEFS = $(addsuffix .ui,$(basename $(BLUEPRINTS))) CATALOGS = $(wildcard po/*.po) LOCALEDIR = /app/share/locale/ +GIT_DESCRIBE = $(shell git describe | tail -c+2) XGETTEXT_OPTS = \ --package-name=$(APPID) \ @@ -71,6 +72,8 @@ flatpak-lint-repo: .PHONY: devel: + sed -i 's/^version = .*/version = "$(GIT_DESCRIBE)"/' Cargo.toml + cargo update -p turnon sed -i '/de.swsnr.turnon.Devel/! s/de\.swsnr\.turnon/de.swsnr.turnon.Devel/g' \ src/config.rs \ resources/de.swsnr.turnon.metainfo.xml.in de.swsnr.turnon.desktop.in \ diff --git a/src/app.rs b/src/app.rs index 11675ac..31e52ef 100644 --- a/src/app.rs +++ b/src/app.rs @@ -50,10 +50,7 @@ impl TurnOnApplication { "/de/swsnr/turnon/de.swsnr.turnon.metainfo.xml", Some(crate::config::VERSION), ); - - if crate::config::is_development() { - dialog.set_version("devel"); - } + dialog.set_version(crate::config::VERSION); glib::spawn_future_local(glib::clone!( #[strong(rename_to = devices)]