From 37a09f1edc57924dabcf2a71794a42e37b5a354c Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Tue, 23 Oct 2012 19:22:52 +1300 Subject: altosdroid: match only the current version tag Don't match non version tags - and always return the long format of git describe, rather than just the tag (when the tag is on the current commit). Split the commit number/hash more reliably by removing the version tag from the result first. Signed-off-by: Mike Beattie --- altosdroid/buildinfo.sh | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/altosdroid/buildinfo.sh b/altosdroid/buildinfo.sh index f620c4a0..781b251b 100755 --- a/altosdroid/buildinfo.sh +++ b/altosdroid/buildinfo.sh @@ -1,24 +1,30 @@ #!/bin/sh # +# Author: Mike Beattie +# +# Script to parse result from git describe, and push values into +# BuildInfo.java for use within altosdroid (to display the current +# version and build information, primarily). +# -describe=$(git describe --always 2>/dev/null || echo '') -if [ -n "$describe" ]; then - version=$(echo $describe | cut -d- -f1) - commitnum=$(echo $describe | cut -d- -f2) - commithash=$(echo $describe | cut -d- -f3) -else - . ../src/Version - version=$VERSION - commitnum='' - commithash='' -fi +infile=src/org/altusmetrum/AltosDroid/BuildInfo.java.in +outfile=src/org/altusmetrum/AltosDroid/BuildInfo.java +. ../src/Version +version=$VERSION +commitnum='' +commithash='' builddate=$(date "+%Y-%m-%d") buildtime=$(date "+%H:%M") -infile=src/org/altusmetrum/AltosDroid/BuildInfo.java.in -outfile=src/org/altusmetrum/AltosDroid/BuildInfo.java +describe=$(git describe --match "$version" --long --always 2>/dev/null || echo '') +if [ -n "$describe" ]; then + 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" -- cgit v1.2.3 From 5ad62b07bef41921b46cb7251072dc24290ee4c9 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Wed, 24 Oct 2012 20:52:09 +1300 Subject: altosdroid: Add branch to BuildInfo Signed-off-by: Mike Beattie --- altosdroid/buildinfo.sh | 11 ++++++++--- 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@"; } -- cgit v1.2.3 From 78e1de481bfdbf7c7bb908c317b23c8ee275c84f Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Wed, 24 Oct 2012 20:54:18 +1300 Subject: altosdroid: Add version information to UI Signed-off-by: Mike Beattie --- altosdroid/res/layout/altosdroid.xml | 35 +++++++++++++++------- .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 6 ++++ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml index f185ea9f..691c5e04 100644 --- a/altosdroid/res/layout/altosdroid.xml +++ b/altosdroid/res/layout/altosdroid.xml @@ -335,15 +335,30 @@ - + + + + + + + diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index b1fc8d30..ab1fb0de 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -81,6 +81,7 @@ public class AltosDroid extends Activity { // Generic field for extras at the bottom private TextView mTextView; + private TextView mVersion; // Service private boolean mIsBound = false; @@ -249,6 +250,11 @@ public class AltosDroid extends Activity { mTextView.setClickable(false); mTextView.setLongClickable(false); + mVersion = (TextView) findViewById(R.id.version); + mVersion.setText("Version: " + BuildInfo.version + + " Built: " + BuildInfo.builddate + " " + BuildInfo.buildtime + " " + BuildInfo.buildtz + + " (" + BuildInfo.branch + "-" + BuildInfo.commitnum + "-" + BuildInfo.commithash + ")"); + mCallsignView = (TextView) findViewById(R.id.callsign_value); mRSSIView = (TextView) findViewById(R.id.rssi_value); mSerialView = (TextView) findViewById(R.id.serial_value); -- cgit v1.2.3