diff options
| author | Mike Beattie <mike@ethernal.org> | 2012-10-24 20:52:09 +1300 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2012-10-24 20:52:09 +1300 |
| commit | 5ad62b07bef41921b46cb7251072dc24290ee4c9 (patch) | |
| tree | 9011773ae07c85f1ad59211d9d5592c2eff1644d | |
| parent | 37a09f1edc57924dabcf2a71794a42e37b5a354c (diff) | |
altosdroid: Add branch to BuildInfo
Signed-off-by: Mike Beattie <mike@ethernal.org>
| -rwxr-xr-x | altosdroid/buildinfo.sh | 11 | ||||
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/altosdroid/buildinfo.sh b/altosdroid/buildinfo.sh index 781b251b..e1b650f8 100755 --- a/altosdroid/buildinfo.sh +++ b/altosdroid/buildinfo.sh @@ -12,26 +12,31 @@ outfile=src/org/altusmetrum/AltosDroid/BuildInfo.java . ../src/Version version=$VERSION +branch='' commitnum='' commithash='' builddate=$(date "+%Y-%m-%d") buildtime=$(date "+%H:%M") +buildtz=$(date "+%z") describe=$(git describe --match "$version" --long --always 2>/dev/null || echo '') if [ -n "$describe" ]; then + branch=$(git status -s -b | sed -ne '1s/^## \(.*\)\.\.\..*$/\1/p') commitdetails=$(echo $describe | sed -e "s/^$version-//") commitnum=$(echo $commitdetails | cut -d- -f1) commithash=$(echo $commitdetails | cut -d- -f2) fi -echo "Version $describe, built on $builddate, $buildtime" +echo "Version $describe, built on $builddate $buildtime $buildtz" -sed -e "s/@DESCRIBE@/$describe/" \ - -e "s/@VERSION@/$version/" \ +sed -e "s/@VERSION@/$version/" \ + -e "s/@DESCRIBE@/$describe/" \ + -e "s/@BRANCH@/$branch/" \ -e "s/@COMMITNUM@/$commitnum/" \ -e "s/@COMMITHASH@/$commithash/" \ -e "s/@BUILDDATE@/$builddate/" \ -e "s/@BUILDTIME@/$buildtime/" \ + -e "s/@BUILDTZ@/$buildtz/" \ $infile > $outfile diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in b/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in index 763f814e..e9b3011a 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in +++ b/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in @@ -18,11 +18,13 @@ package org.altusmetrum.AltosDroid; public class BuildInfo { - public static final String git_describe = "@DESCRIBE@"; public static final String version = "@VERSION@"; + public static final String git_describe = "@DESCRIBE@"; + public static final String branch = "@BRANCH@"; public static final String commitnum = "@COMMITNUM@"; public static final String commithash = "@COMMITHASH@"; public static final String builddate = "@BUILDDATE@"; public static final String buildtime = "@BUILDTIME@"; + public static final String buildtz = "@BUILDTZ@"; } |