diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-01-08 20:34:42 +0100 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-01-08 20:34:42 +0100 |
commit | 83e76bea8fd542e9314820a3679fc4bd26be5041 (patch) | |
tree | 2ff0a42ded081b24d81f7f5858798b1e4440c40c /scripts | |
parent | e221ddadf37edeec319230fd5bea21891fdb55a7 (diff) | |
download | embtoolkit-83e76bea8fd542e9314820a3679fc4bd26be5041.tar.gz embtoolkit-83e76bea8fd542e9314820a3679fc4bd26be5041.tar.bz2 embtoolkit-83e76bea8fd542e9314820a3679fc4bd26be5041.tar.xz |
test setlocalversion
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/setlocalversion | 95 |
1 files changed, 71 insertions, 24 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 62e3b55..6ebb7e5 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -1,36 +1,88 @@ #!/bin/sh -# Print additional version information for non-release trees. +# +# This scripts adds local version information from the version +# control systems git, mercurial (hg) and subversion (svn). +# +# <nico-linuxsetlocalversion -at- schottelius.org>. +# usage() { - echo "Usage: $0 [srctree]" >&2 + echo "Usage: $0 [--save-scmversion] [srctree]" >&2 exit 1 } -cd "${1:-.}" || usage +scmversion_print() { +scm_only=false +srctree=. +if test "$1" = "--save-scmversion"; then + scm_only=true + shift +fi +if test $# -gt 0; then + srctree=$1 + shift +fi +if test $# -gt 0 -o ! -d "$srctree"; then + usage +fi + +local short +short=false + +cd "$srctree" +if test -e .scmversion; then + cat .scmversion + return +fi +if test "$1" = "--short"; then + short=true +fi # Check for git and a git repo. -if head=`git rev-parse --verify HEAD 2>/dev/null`; then - # Do we have an untagged version? - if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then - if tag=`git describe 2>/dev/null`; then - echo $tag | awk -F- '{printf("%05d-%s", $(NF-1),$(NF))}' +if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then + + # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore + # it, because this version is defined in the top level Makefile. + if [ -z "`git describe --exact-match 2>/dev/null`" ]; then + + # If only the short version is requested, don't bother + # running further git commands + if $short; then + echo "+" + return + fi + # If we are past a tagged commit (like + # "v2.6.30-rc5-302-g72357d5"), we pretty print it. + if atag="`git describe 2>/dev/null`"; then + echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' + + # If we don't have a tag at all we print -g{commitish}. + else + printf '%s%s' -g $head fi fi - # Are there uncommitted changes? - git update-index --refresh --unmerged > /dev/null + # Is this git on svn? + if git config --get svn-remote.svn.url >/dev/null; then + printf -- '-svn%s' "`git svn find-rev $head`" + fi + + # Update index only on r/w media + [ -w . ] && git update-index --refresh --unmerged > /dev/null + + # Check for uncommitted changes if git diff-index --name-only HEAD | grep -v "^scripts/package" \ | read dummy; then printf '%s' -dirty fi # All done with git - exit + return fi # Check for mercurial and a mercurial repo. -if hgid=`hg id 2>/dev/null`; then - tag=`printf '%s' "$hgid" | cut -d' ' -f2` +if test -d .hg && hgid=`hg id 2>/dev/null`; then + tag=`printf '%s' "$hgid" | cut -s -d' ' -f2` # Do we have an untagged version? if [ -z "$tag" -o "$tag" = tip ]; then @@ -45,22 +97,17 @@ if hgid=`hg id 2>/dev/null`; then esac # All done with mercurial - exit + return fi # Check for svn and a svn repo. -if rev=`svn info 2>/dev/null | grep '^Revision'`; then +if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then rev=`echo $rev | awk '{print $NF}'` - changes=`svn status 2>/dev/null | grep '^[AMD]' | wc -l` - - # Are there uncommitted changes? - if [ $changes != 0 ]; then - printf -- 'svn%s%s%s' "$rev" -dirty "$changes" - else - printf -- 'svn%s' "$rev" - fi + printf -- '-svn%s' "$rev" # All done with svn - exit + return fi +} +scmversion_print |