From 339d1d8f557e88ef6bb5812980b8988dc8fdf10d Mon Sep 17 00:00:00 2001 From: Marvin W Date: Wed, 30 Mar 2022 10:36:07 -0600 Subject: Fix Version handling, add function to retrieve short version without git commit --- main/CMakeLists.txt | 2 +- main/src/ui/application.vala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'main') diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index e052785a..2326253c 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -212,7 +212,7 @@ OPTIONS ${MAIN_EXTRA_OPTIONS} ) -add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\" -DDINO_VERSION=\"${PROJECT_VERSION}\") +add_definitions(${VALA_CFLAGS} -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\") add_executable(dino ${MAIN_VALA_C} ${MAIN_GRESOURCES_TARGET} src/emojichooser.c) add_dependencies(dino ${GETTEXT_PACKAGE}-translations) target_include_directories(dino PRIVATE src) diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala index 2fd5320e..6c02087f 100644 --- a/main/src/ui/application.vala +++ b/main/src/ui/application.vala @@ -42,7 +42,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application { startup.connect(() => { if (print_version) { - print(@"Dino $(Dino.VERSION)\n"); + print(@"Dino $(Dino.get_version())\n"); Process.exit(0); } @@ -270,7 +270,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application { } private void show_about_window() { - string? version = Dino.VERSION.strip().length == 0 ? null : Dino.VERSION; + string? version = Dino.get_version().strip().length == 0 ? null : Dino.get_version(); if (version != null && !version.contains("git")) { switch (version.substring(0, 3)) { case "0.2": version = @"$version - Mexican Caribbean Coral Reefs"; break; -- cgit v1.2.3-70-g09d2