From 314707d67aa2cbd6df3c0a24d4a8cbf793a03945 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Thu, 14 Jun 2018 12:52:01 +0100
Subject: [PATCH] Add `git describe` support for AppVeyor builds

---
 openrct2.proj                   | 3 +++
 scripts/ps/appveyor_install.ps1 | 1 +
 2 files changed, 4 insertions(+)

diff --git a/openrct2.proj b/openrct2.proj
index 6352fdaaf4..6e45cd685b 100644
--- a/openrct2.proj
+++ b/openrct2.proj
@@ -5,6 +5,7 @@
        - GIT_TAG
        - GIT_BRANCH
        - GIT_COMMIT_SHA1
+       - GIT_DESCRIBE
        - SIGN_PASSWORD
        - OPENRCT2_ORG_TOKEN
        - NO_NSIS: set to true to prevent the NSIS installer building
@@ -28,6 +29,7 @@
     <OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_BRANCH)'!=''">/D "OPENRCT2_BRANCH=\"$(GIT_BRANCH)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
     <OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_COMMIT_SHA1)'!=''">/D "OPENRCT2_COMMIT_SHA1=\"$(GIT_COMMIT_SHA1)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
     <OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">/D "OPENRCT2_COMMIT_SHA1_SHORT=\"$(GIT_COMMIT_SHA1_SHORT)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
+    <OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_DESCRIBE)'!=''">/D "OPENRCT2_VERSION_TAG=\"$(GIT_DESCRIBE)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
 
     <RootDir>$(MsBuildThisFileDirectory)</RootDir>
     <DistDir>$(RootDir)distribution\</DistDir>
@@ -161,6 +163,7 @@
     <PropertyGroup>
       <BuildString Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">$(GIT_COMMIT_SHA1_SHORT)</BuildString>
       <BuildString Condition="'$(GIT_BRANCH)'!=''">$(BuildString) ($(GIT_BRANCH))</BuildString>
+      <BuildString Condition="'$(GIT_DESCRIBE)'!=''">$(BuildString) ($(GIT_DESCRIBE))</BuildString>
     </PropertyGroup>
     <ItemGroup>
       <DataItems Include="$(RootDir)data\**\*" />
diff --git a/scripts/ps/appveyor_install.ps1 b/scripts/ps/appveyor_install.ps1
index d916fa0408..077a90647b 100644
--- a/scripts/ps/appveyor_install.ps1
+++ b/scripts/ps/appveyor_install.ps1
@@ -66,3 +66,4 @@ if (${env:APPVEYOR_REPO_TAG} -ne "true")
     $env:GIT_BRANCH = $env:APPVEYOR_REPO_BRANCH
 }
 $env:GIT_COMMIT_SHA1 = $env:APPVEYOR_REPO_COMMIT
+$env:GIT_DESCRIBE = (git describe HEAD | sed -E "s/-g.+$//")