From 181129d24c83bfcbaa438579c5d3cd2531755232 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 9 Jan 2006 18:07:01 -0800 Subject: For release tarballs, include the proper version When producing a release tarball, include a "version" file, which GIT-VERSION-GEN can then use to do the right thing when building from a tarball. Signed-off-by: H. Peter Anvin Signed-off-by: Junio C Hamano --- GIT-VERSION-GEN | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'GIT-VERSION-GEN') diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 845b9dce6e..7763639a82 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,9 +1,15 @@ #!/bin/sh GVF=GIT-VERSION-FILE +DEF_VER=v1.1.GIT -VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) || VN=v1.0.GIT -VN=$(expr "$VN" : v'\(.*\)') +# First try git-describe, then see if there is a version file +# (included in release tarballs), then default +VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) || +VN=$(cat version) || +VN="$DEF_VER" + +VN=$(expr "$VN" : v*'\(.*\)') if test -r $GVF then VC=$(sed -e 's/^GIT_VERSION = //' <$GVF) -- cgit v1.2.3