From 908636b5961fd14d91ac937d3306ea09f260cfa4 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Mon, 19 Mar 2012 10:28:45 -0400
Subject: Fixed versioning scheme when running on a tag.

git describe is useless in that situation, afaict.
---
 build.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 53bd9c3011..b5a9931450 100644
--- a/build.xml
+++ b/build.xml
@@ -288,7 +288,9 @@ INITIALISATION
     <exec osfamily="unix" executable="tools/get-scala-commit-drift" outputproperty="git.commit.drift" failifexecutionfails="false" />
     <exec osfamily="windows" executable="tools/get-scala-commit-drift.bat" outputproperty="git.commit.drift" failifexecutionfails="false" />
     <!-- some default in case something went wrong getting the revision -->
-    <property name="git.describe" value="-unknown-"/>
+    <property name="git.commit.drift" value="00000000"/>
+    <property name="git.commit.sha" value="unknown"/>
+    <property name="git.commit.date" value="unknown"/>
 
     <!-- We use the git describe to determine the OSGi modifier for our build. -->
     <property
@@ -332,6 +334,8 @@ INITIALISATION
     <echo message="        java args: ${env.ANT_OPTS} ${jvm.opts}" />
     <echo message="       javac args: ${javac.args}" />
     <echo message="      scalac args: ${scalac.args}" />
+    <echo message="         git hash: ${git.commit.sha}" />
+    <echo message="        git drift: ${git.commit.drift}" />
     <echo message="    maven version: ${maven.version.number}"/>
     <echo message="     OSGi version: ${osgi.version.number}" />
     <echo message="canonical version: ${version.number}" />
-- 
cgit v1.2.3