diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-19 10:28:45 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-19 10:31:51 -0400 |
| commit | 908636b5961fd14d91ac937d3306ea09f260cfa4 (patch) | |
| tree | b0d8eef42303cf44dea7512a19b41d90c34d12a5 /build.xml | |
| parent | f6c050e8cfa5bd1ee4bbb3434086d2ae2d35e5f7 (diff) | |
| download | scala-908636b5961fd14d91ac937d3306ea09f260cfa4.tar.gz scala-908636b5961fd14d91ac937d3306ea09f260cfa4.tar.bz2 scala-908636b5961fd14d91ac937d3306ea09f260cfa4.zip | |
Fixed versioning scheme when running on a tag.
git describe is useless in that situation, afaict.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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}" /> |