diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-05-28 12:15:23 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-05-28 17:22:17 +0200 |
| commit | 8ab5996c4a14364411442d93babb343cc2ce0d89 (patch) | |
| tree | c9e3f7a5e57bbe7b937a9f26e8e33b86aa4a2e81 /build-aux/git-version-gen | |
| parent | 8b4add2c64d10b260c21352768e22d41dc9d2ff7 (diff) | |
| download | gnulib-8ab5996c4a14364411442d93babb343cc2ce0d89.tar.gz | |
git-version-gen: take a sed script to transform the git tag
* build-aux/git-version-gen (tag_sed_script): New variable. Use it to
transform the output of "git describe" to the canonical form.
* top/GNUmakefile (_curr-ver): Pass $(git-version-gen-tag-sed-script) as
a second argument to `git-version-gen'.
Diffstat (limited to 'build-aux/git-version-gen')
| -rwxr-xr-x | build-aux/git-version-gen | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 5a7e989584..9b821e0439 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,6 +1,6 @@ #!/bin/sh # Print a version string. -scriptversion=2010-04-26.16; # UTC +scriptversion=2010-05-28.15; # UTC # Copyright (C) 2007-2010 Free Software Foundation, Inc. # @@ -67,11 +67,14 @@ scriptversion=2010-04-26.16; # UTC # echo $(VERSION) > $(distdir)/.tarball-version case $# in - 1) ;; - *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; + 1|2) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version" \ + '[TAG-NORMALIZATION-SED-SCRIPT]' + exit 1;; esac tarball_version_file=$1 +tag_sed_script="${2:-s/x/x/}" nl=' ' @@ -95,6 +98,7 @@ then elif test -d .git \ && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ || git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ && case $v in v[0-9]*) ;; *) (exit 1) ;; |