From 3430b0cab9a4e9f1d89484f7478892979b5cb1bc Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Mon, 4 Jun 2018 13:26:53 +0200
Subject: [PATCH] Fix #648 - Use the current git version when building the
 Windows binaries

---
 .gitignore                      |  1 +
 build.bat                       | 14 +++++++++++++-
 release-windows.sh              |  1 +
 src/dscanner/dscanner_version.d |  5 -----
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1d29087..7ea0dc2 100755
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ dsc
 
 # Git hash
 githash.txt
+githash_.txt
 
 # GDB history
 .gdb_history
diff --git a/build.bat b/build.bat
index abe613a..c51e135 100644
--- a/build.bat
+++ b/build.bat
@@ -4,7 +4,19 @@ setlocal enabledelayedexpansion
 if "%DC%"=="" set DC="dmd"
 if "%DC%"=="ldc2" set DC="ldmd2"
 
-set DFLAGS=-O -release -inline -version=StdLoggerDisableWarning
+:: git might not be installed, so we provide 0.0.0 as a fallback or use
+:: the existing githash file if existent
+git describe --tags > githash_.txt
+for /f %%i in ("githash_.txt") do set githashsize=%%~zi
+if %githashsize% == 0 (
+	if not exist "githash.txt" (
+		echo v0.0.0 > githash.txt
+	)
+) else (
+	move /y githash_.txt githash.txt
+)
+
+set DFLAGS=-O -release -inline -version=StdLoggerDisableWarning -J.
 set TESTFLAGS=-g -w -version=StdLoggerDisableWarning
 set CORE=
 set LIBDPARSE=
diff --git a/release-windows.sh b/release-windows.sh
index cd493a9..a6e4c47 100755
--- a/release-windows.sh
+++ b/release-windows.sh
@@ -19,6 +19,7 @@ fi
 archiveName="dscanner-$VERSION-$OS-$ARCH_SUFFIX.zip"
 echo "Building $archiveName"
 mkdir -p bin
+git describe --tags > githash.txt # no git installed under Wine
 DC="$DIR/dmd2/windows/bin/dmd.exe" wine cmd /C build.bat
 
 cd bin
diff --git a/src/dscanner/dscanner_version.d b/src/dscanner/dscanner_version.d
index eb7611a..0509eef 100644
--- a/src/dscanner/dscanner_version.d
+++ b/src/dscanner/dscanner_version.d
@@ -8,16 +8,11 @@ module dscanner.dscanner_version;
 /**
  * Human-readable version number
  */
-enum DEFAUULT_DSCANNER_VERSION = "v0.5.5";
 
 version (built_with_dub)
 {
 	enum DSCANNER_VERSION = import("dubhash.txt");
 }
-else version (Windows)
-{
-	enum DSCANNER_VERSION = DEFAUULT_DSCANNER_VERSION;
-}
 else
 {
 	/**