Inject git version for devel builds

swsnr · Dec 28, 2024 · d1550f6 · d1550f6
1 parent b77c6db
commit d1550f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)]