diff options
| author | Peter Johnson <peter@tortall.net> | 2011-10-30 22:39:50 -0700 |
|---|---|---|
| committer | Peter Johnson <peter@tortall.net> | 2011-10-31 00:29:42 -0700 |
| commit | 0f5e8ebdb5a273d8fd61e00e90d0c9778b7814cf (patch) | |
| tree | b4fe416f9337367dc0b22f9336b49c8cbaabc647 | |
| parent | e437ef429275706322f71362651376ba6998e4a6 (diff) | |
| download | yasm-0f5e8ebdb5a273d8fd61e00e90d0c9778b7814cf.tar.gz | |
Bump DEF_VER to 1.2.0 for release.v1.2.0
| -rwxr-xr-x | YASM-VERSION-GEN.sh | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/YASM-VERSION-GEN.sh b/YASM-VERSION-GEN.sh index 00c0136f..3a9f7436 100755 --- a/YASM-VERSION-GEN.sh +++ b/YASM-VERSION-GEN.sh @@ -1,7 +1,7 @@ #!/bin/sh YVF=YASM-VERSION-FILE -DEF_VER=v1.1.0 +DEF_VER=v1.2.0 LF=' ' @@ -15,16 +15,6 @@ elif test -d .git -o -f .git && VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; - v0.1.0*) - # Special handling until we get a more recent tag on the - # master branch - MERGE_BASE=$(git merge-base $DEF_VER HEAD 2>/dev/null) - VN1=$(git rev-list $MERGE_BASE..HEAD | wc -l 2>/dev/null) - VN2=$(git rev-list --max-count=1 --abbrev-commit --abbrev=4 HEAD 2>/dev/null) - VN=$(echo "v$DEF_VER-$VN1-g$VN2" | sed -e 's/ //g') - git update-index -q --refresh - test -z "$(git diff-index --name-only HEAD --)" || - VN="$VN-dirty" ;; v[0-9]*) git update-index -q --refresh test -z "$(git diff-index --name-only HEAD --)" || |