From e4fc043123cc1ca5738600802d78a0ad70e02318 Mon Sep 17 00:00:00 2001 From: Jim Ursetto Date: Fri, 1 Jul 2011 18:15:57 -0500 Subject: [PATCH 2/3] Use new ##sys#build-* version variables in Unit library --- identify-branch.sh | 4 ++-- library.scm | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/identify-branch.sh b/identify-branch.sh index f98c65e..89a68f1 100755 --- a/identify-branch.sh +++ b/identify-branch.sh @@ -5,10 +5,10 @@ # usage: identify-branch SOURCEDIR if test -d "$1/.git"; then - branchname=`GIT_DIR="$1/.git" git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'` + branchname=`GIT_DIR="$1/.git" git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` case ${branchname} in "") ;; - "(master)") ;; + "master") ;; *) echo "${branchname}";; esac fi diff --git a/library.scm b/library.scm index f05256f..b930433 100644 --- a/library.scm +++ b/library.scm @@ -3552,14 +3552,17 @@ EOF (if (##sys#fudge 32) " gchooks" "") (if (##sys#fudge 39) " cross" "") ) ) ) (string-append - "Version " +build-version+ " " +branch-name+ "\n" + "Version " ##sys#build-version + (if ##sys#build-branch (string-append " (" ##sys#build-branch ")") "") + (if ##sys#build-id (string-append " (rev " ##sys#build-id ")") "") + "\n" (get-config) (if (zero? (##sys#size spec)) "" (string-append " [" spec " ]") ) "\n" - +build-tag+)) - +build-version+) ) + (or ##sys#build-tag ""))) + ##sys#build-version) ) ;;; Feature identifiers: -- 1.7.4.1