[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git-version-gen
From: |
Simon Josefsson |
Subject: |
Re: git-version-gen |
Date: |
Sun, 13 Nov 2011 14:47:55 +0100 |
User-agent: |
Gnus/5.110018 (No Gnus v0.18) Emacs/23.2 (gnu/linux) |
Simon Josefsson <address@hidden> writes:
> How about this patch to make the match string configurable?
That was broken, I pushed a better one that should have less backwards
compatibility issues (I hope).
/Simon
diff --git a/ChangeLog b/ChangeLog
index 13248fc..b6bf5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-11-13 Simon Josefsson <address@hidden>
+ * build-aux/git-version-gen: Add --prefix to configure the tag
+ match string.
+
+2011-11-13 Simon Josefsson <address@hidden>
+
* build-aux/git-version-gen: Add --help and --version.
2011-11-12 Jim Meyering <address@hidden>
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 3234bdd..c7a58af 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
#!/bin/sh
# Print a version string.
-scriptversion=2011-11-13.10; # UTC
+scriptversion=2011-11-13.13; # UTC
# Copyright (C) 2007-2011 Free Software Foundation, Inc.
#
@@ -85,6 +85,8 @@ Print a version string.
Options:
+ --prefix prefix of git tags (default 'v')
+
--help display this help and exit
--version output version information and exit
@@ -94,6 +96,7 @@ while test $# -gt 0; do
case $1 in
--help) echo "$usage"; exit 0;;
--version) echo "$version"; exit 0;;
+ --prefix) shift; prefix="$1";;
-*)
echo "$0: Unknown option \`$1'." >&2
echo "$0: Try \`--help' for more information." >&2
@@ -117,6 +120,7 @@ if test -z "$tarball_version_file"; then
fi
tag_sed_script="${tag_sed_script:-s/x/x/}"
+prefix="${prefix:-v}"
nl='
'
@@ -146,11 +150,11 @@ then
# directory, and "git describe" output looks sensible, use that to
# derive a version string.
elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
- && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
+ && v=`git describe --abbrev=4 --match="$prefix*" 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]*) ;;
+ $prefix[0-9]*) ;;
*) (exit 1) ;;
esac
then
@@ -183,7 +187,7 @@ else
v=UNKNOWN
fi
-v=`echo "$v" |sed 's/^v//'`
+v=`echo "$v" |sed "s/^$prefix//"`
# Test whether to append the "-dirty" suffix only if the version
# string we're using came from git. I.e., skip the test if it's "UNKNOWN"