From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 7 Sep 2015 12:08:27 +0000 (+0100)
Subject: JAL-1522 report commit id and branch in installation type (may move this to separate... 
X-Git-Tag: Release_2_10_0~480
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fab6b5b79afa35f108f45eee44350478d363ac1c;p=jalview.git

JAL-1522 report commit id and branch in installation type (may move this to separate property in future?)
---

diff --git a/build.xml b/build.xml
index d0aad96..e9006ca 100755
--- a/build.xml
+++ b/build.xml
@@ -189,12 +189,22 @@
     <tstamp prefix="build">
       <format property="date" pattern="dd MMMM yyyy" />
     </tstamp>
+    <exec executable="/usr/bin/git" outputproperty="git.commit"  failifexecutionfails="false">
+      <arg value="rev-parse"/>
+      <arg value="--short"/>
+      <arg value="HEAD"/>
+    </exec>
+    <exec executable="/usr/bin/git" outputproperty="git.branch" failifexecutionfails="false">
+      <arg value="rev-parse"/>
+      <arg value="--abbrev-ref"/>
+      <arg value="HEAD"/>
+    </exec>
     <properties file="${outputDir}/.build_properties">
       <header>
           ---Jalview Build Details---
         </header>    	
       <property name="VERSION" value="${JALVIEW_VERSION}" />
-      <property name="INSTALLATION" value="${INSTALLATION}" />
+      <property name="INSTALLATION" value="${INSTALLATION} git-commit:${git.commit} [${git.branch}]" />
       <property name="BUILD_DATE" value="${build.date}" />
     </properties>
   </target>