From e498d461df38ea43c0bc14650a2429514ee1a94a Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Thu, 29 Jan 2015 02:12:09 -0800
Subject: [PATCH] Better version number support.

---
 .gitignore             |  3 +++
 makefile               | 15 +++++++++------
 src/dscanner_version.d | 20 ++++++++++++++++++++
 src/main.d             |  6 +++++-
 4 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 src/dscanner_version.d

diff --git a/.gitignore b/.gitignore
index f14a608..6ccffae 100755
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ dscanner-report.json
 
 #debug build
 dsc
+
+# Git hash
+githash.txt
diff --git a/makefile b/makefile
index db8b8fe..8071589 100644
--- a/makefile
+++ b/makefile
@@ -16,21 +16,24 @@ all: dmdbuild
 ldc: ldcbuild
 gdc: gdcbuild
 
+githash:
+	git log -1 --format="%H" > githash.txt
+
 debug:
 	${DMD} -w -g -ofdsc ${VERSIONS} ${DEBUG_VERSIONS} ${INCLUDE_PATHS} ${SRC}
 
-dmdbuild:
+dmdbuild: githash
 	mkdir -p bin
-	${DMD} -w -O -release -inline -ofbin/dscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC}
+	${DMD} -w -O -release -inline -ofbin/dscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC} -J.
 	rm -f bin/dscanner.o
 
-gdcbuild:
+gdcbuild: githash
 	mkdir -p bin
-	${GDC} -O3 -frelease -obin/dscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC}
+	${GDC} -O3 -frelease -obin/dscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC} -J.
 
-ldcbuild:
+ldcbuild: githash
 	mkdir -p bin
-	${LDC} -O5 -release -oq -of=bin/dscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC}
+	${LDC} -O5 -release -oq -of=bin/dscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC} -J.
 
 test:
 	@./test.sh
diff --git a/src/dscanner_version.d b/src/dscanner_version.d
new file mode 100644
index 0000000..f154668
--- /dev/null
+++ b/src/dscanner_version.d
@@ -0,0 +1,20 @@
+//          Copyright Brian Schott (Hackerpilot) 2015.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+module dscanner_version;
+
+/**
+ * Human-readable version number
+ */
+enum DSCANNER_VERSION = "v0.2.0-dev";
+
+version (Windows) {}
+else
+{
+	/**
+	 * Current build's Git commit hash
+	 */
+	enum GIT_HASH = import("githash.txt");
+}
diff --git a/src/main.d b/src/main.d
index c700367..f43d363 100644
--- a/src/main.d
+++ b/src/main.d
@@ -26,6 +26,7 @@ import outliner;
 import symbol_finder;
 import analysis.run;
 import analysis.config;
+import dscanner_version;
 
 import inifiled;
 
@@ -101,7 +102,10 @@ int run(string[] args)
 
 	if (printVersion)
 	{
-		writeln("v0.1.0");
+		version (Windows)
+			writeln(DSCANNER_VERSION);
+		else
+			write(DSCANNER_VERSION, " ", GIT_HASH);
 		return 0;
 	}