From: Felix Dörre <felix@dogcraft.de>
Date: Tue, 30 Jan 2018 23:44:47 +0000 (+0100)
Subject: Merge "chg: jar version to match the version generated for the package"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=15f6a8ada052ca217dc9203b32f9d1fdb2f27e17;hp=bd3c5e1096e67a7cc3b85b61ec9a0fddc21aec7b

Merge "chg: jar version to match the version generated for the package"
---

diff --git a/build.xml b/build.xml
index d5b95abc..abf1e3b1 100644
--- a/build.xml
+++ b/build.xml
@@ -84,9 +84,9 @@
 	<target depends="clean,clean-test" name="cleanall" />
 	<target depends="build-project, build-testing, native" name="build" />
 	<target depends="init" name="build-project">
-		<exec outputproperty="git-version" executable="git">
-			<arg line="rev-parse"/>
-			<arg line="HEAD"/>
+		<exec outputproperty="git-version" executable="sh">
+			<arg value="-c"/>
+			<arg value="git describe HEAD --tags --match &quot;v*&quot; | sed &quot;s/^v//&quot;"/>
 		</exec>
 		<manifest file="Gigi.MF">
 			<attribute name="Main-Class" value="club.wpia.gigi.Launcher" />