From e4fc043123cc1ca5738600802d78a0ad70e02318 Mon Sep 17 00:00:00 2001
From: Jim Ursetto <zbigniewsz@gmail.com>
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
|
b
|
|
5 | 5 | # usage: identify-branch SOURCEDIR |
6 | 6 | |
7 | 7 | if test -d "$1/.git"; then |
8 | | branchname=`GIT_DIR="$1/.git" git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'` |
| 8 | branchname=`GIT_DIR="$1/.git" git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` |
9 | 9 | case ${branchname} in |
10 | 10 | "") ;; |
11 | | "(master)") ;; |
| 11 | "master") ;; |
12 | 12 | *) echo "${branchname}";; |
13 | 13 | esac |
14 | 14 | fi |
diff --git a/library.scm b/library.scm
index f05256f..b930433 100644
a
|
b
|
EOF |
3552 | 3552 | (if (##sys#fudge 32) " gchooks" "") |
3553 | 3553 | (if (##sys#fudge 39) " cross" "") ) ) ) |
3554 | 3554 | (string-append |
3555 | | "Version " +build-version+ " " +branch-name+ "\n" |
| 3555 | "Version " ##sys#build-version |
| 3556 | (if ##sys#build-branch (string-append " (" ##sys#build-branch ")") "") |
| 3557 | (if ##sys#build-id (string-append " (rev " ##sys#build-id ")") "") |
| 3558 | "\n" |
3556 | 3559 | (get-config) |
3557 | 3560 | (if (zero? (##sys#size spec)) |
3558 | 3561 | "" |
3559 | 3562 | (string-append " [" spec " ]") ) |
3560 | 3563 | "\n" |
3561 | | +build-tag+)) |
3562 | | +build-version+) ) |
| 3564 | (or ##sys#build-tag ""))) |
| 3565 | ##sys#build-version) ) |
3563 | 3566 | |
3564 | 3567 | |
3565 | 3568 | ;;; Feature identifiers: |