altosdroid: Add branch to BuildInfo

Signed-off-by: Mike Beattie <mike@ethernal.org>

diff --git a/altosdroid/buildinfo.sh b/altosdroid/buildinfo.sh
index 781b251bc6ecb4489915f58a466e554a8d097831..e1b650f8f2e04afc2c294075473f0704b4ead9d4 100755 (executable)
--- a/altosdroid/buildinfo.sh
+++ b/altosdroid/buildinfo.sh
@@ -12,26 +12,31 @@ outfile=src/org/altusmetrum/AltosDroid/BuildInfo.java
 
 . ../src/Version
 version=$VERSION
 
 . ../src/Version
 version=$VERSION

+branch=''

 commitnum=''
 commithash=''
 builddate=$(date "+%Y-%m-%d")
 buildtime=$(date "+%H:%M")
 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
 
 
 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
 
 
    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/@COMMITNUM@/$commitnum/" \
     -e "s/@COMMITHASH@/$commithash/" \
     -e "s/@BUILDDATE@/$builddate/" \
     -e "s/@BUILDTIME@/$buildtime/" \

+    -e "s/@BUILDTZ@/$buildtz/" \

  $infile > $outfile
  $infile > $outfile

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in b/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in
index 763f814efffec236d240a457ad980d0bdc25514c..e9b3011a39d027297e0dcb2bde12105f42d000e4 100644 (file)
--- 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 {
 package org.altusmetrum.AltosDroid;
 
 public class BuildInfo {

-       public static final String git_describe = "@DESCRIBE@";

        public static final String version      = "@VERSION@";
        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 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@";

 }
 
 }