X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=GIT-VERSION-GEN;h=b8abff355e071af95ae8fc7aafd575e131495438;hp=15c387942fad6748244a530728bf58edc69c83ff;hb=99708bef7ad12ccb9399186f6055004d11bcf3db;hpb=32e646780461f96682d1191d31e08e4602ab125e

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 15c38794..b8abff35 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -8,7 +8,7 @@ LF='
 '
 
 # First see if there is a version file (included in release tarballs),
-# then try git-describe, then default.
+# then try git-describe, then gitweb, then default.
 if [[ -f VERSION ]]; then
 	VN=$(cat VERSION) || VN="$DEF_VER"
 elif [[ -d .git || -f .git ]] &&
@@ -16,12 +16,14 @@ elif [[ -d .git || -f .git ]] &&
 	case "$VN" in
 	*$LF*) (exit 1) ;;
 	v[0-9]*)
-		git update-index -q --refresh
+		git update-index -q --refresh &>/dev/null
 		test -z "$(git diff-index --name-only HEAD --)" ||
 		VN="$VN-dirty" ;;
 	esac
 then
 	VN=$(echo "$VN" | sed -e 's/-/./g');
+elif [[ "$PWD" =~ paraslash-[a-f0-9]{1,} ]]; then
+	VN="${PWD#*-}"
 else
 	VN="$DEF_VER"
 fi
@@ -31,8 +33,10 @@ echo "$VN"
 
 [[ -z "$GVF" ]] && exit 0
 if [[ -r "$GVF" ]]; then
-	VC=$(sed -e 's/^#define GIT_VERSION "//; s/"$//' < "$GVF")
+	pattern='^#define GIT_VERSION "'
+	VC=$(grep "$pattern" < "$GVF" | sed -e "s/$pattern//; s/\"$//")
 	[[ "$VN" == "$VC" ]] && exit 0
 fi
 echo >&2 "new git version: $VN"
-echo "#define GIT_VERSION \"$VN\"" >$GVF
+echo "/** \\file ${GVF##*/} Auto-generated version file. Do not edit. */" >$GVF
+echo "#define GIT_VERSION \"$VN\"" >> $GVF