Modified version number string in qmake builds to pull the top tag.

skiselkov · Aug 30, 2017 · 29d510b · 29d510b
1 parent c88fb2a
commit 29d510b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
@@ -40,7 +40,8 @@ DEFINES += _GNU_SOURCE DEBUG _FILE_OFFSET_BITS=64 _USE_MATH_DEFINES
 
 # Latest X-Plane APIs. No legacy support needed.
 DEFINES += XPLM200 XPLM210
-DEFINES += XRAAS2_BUILD_VERSION=\'\"$$system("git rev-parse --short HEAD")\"\'
+DEFINES += \
+    XRAAS2_BUILD_VERSION=\'\"$$system("git describe --abbrev=0 --tags")\"\'
 
 # Aircraft-specific defines
 DEFINES += ACF_TYPE=$$[ACF_TYPE]

diff --git a/src/gui.c b/src/gui.c
@@ -71,8 +71,8 @@
 # define	NEWLINE "\n"
 #endif		/* !IBM */
 
-#define	COPYRIGHT1	XRAAS_MENU_NAME " version " XRAAS2_VERSION \
-	"   Copyright 2017 Saso Kiselkov. All rights reserved."
+#define	COPYRIGHT1	XRAAS_MENU_NAME XRAAS2_VERSION \
+	"       Copyright 2017 Saso Kiselkov. All rights reserved."
 #define	COPYRIGHT2	"X-RAAS is open-source software. See COPYING for " \
 			"more information."
 #define	TOOLTIP_HINT	"Hint: hover your mouse cursor over any knob to " \

diff --git a/src/xraas2.h b/src/xraas2.h
@@ -30,7 +30,7 @@
 extern "C" {
 #endif
 
-#define	XRAAS2_VERSION			"2.1-" XRAAS2_BUILD_VERSION
+#define	XRAAS2_VERSION			XRAAS2_BUILD_VERSION
 #define	TATL_FIELD_ELEV_UNSET		-1000000
 #define	RWY_PROXIMITY_TIME_FACT		2		/* seconds */
 #define	ARPT_LOAD_LIMIT			NM2MET(8)	/* meters */