From d96b48f765db0bd4ce97a521b76a25e51f70f122 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Fri, 6 Apr 2018 09:28:27 +0200
Subject: [PATCH] Use git --describe tags as version string

---
 makefile                        | 2 +-
 src/dscanner/dscanner_version.d | 7 ++++---
 src/dscanner/main.d             | 7 +------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/makefile b/makefile
index dc6361a..3523f2b 100644
--- a/makefile
+++ b/makefile
@@ -36,7 +36,7 @@ ldc: ldcbuild
 gdc: gdcbuild
 
 githash:
-	git log -1 --format="%H" > githash.txt
+	git describe --tags > githash.txt
 
 debug:
 	${DC} -w -g -J. -ofdsc ${VERSIONS} ${DEBUG_VERSIONS} ${INCLUDE_PATHS} ${SRC}
diff --git a/src/dscanner/dscanner_version.d b/src/dscanner/dscanner_version.d
index 3867e03..63c829b 100644
--- a/src/dscanner/dscanner_version.d
+++ b/src/dscanner/dscanner_version.d
@@ -8,19 +8,20 @@ module dscanner.dscanner_version;
 /**
  * Human-readable version number
  */
-enum DSCANNER_VERSION = "v0.4.0";
+enum DEFAUULT_DSCANNER_VERSION = "v0.5.0";
 
 version (built_with_dub)
 {
-	enum GIT_HASH = import("dubhash.txt");
+	enum DSCANNER_VERSION = import("dubhash.txt");
 }
 else version (Windows)
 {
+	enum DSCANNER_VERSION = DEFAUULT_DSCANNER_VERSION;
 }
 else
 {
 	/**
 	 * Current build's Git commit hash
 	 */
-	enum GIT_HASH = import("githash.txt");
+	enum DSCANNER_VERSION = import("githash.txt");
 }
diff --git a/src/dscanner/main.d b/src/dscanner/main.d
index 7aa1417..da3f8ad 100644
--- a/src/dscanner/main.d
+++ b/src/dscanner/main.d
@@ -139,12 +139,7 @@ else
 
 	if (printVersion)
 	{
-		version (Windows)
-			writeln(DSCANNER_VERSION);
-		else version (built_with_dub)
-			writeln(DSCANNER_VERSION);
-		else
-			write(DSCANNER_VERSION, " ", GIT_HASH);
+		write(DSCANNER_VERSION);
 		return 0;
 	}