diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-12 13:02:27 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-12 13:02:27 -0800 |
| commit | 96f33f50f3d12a4c5ac7ac1174c7762cc21a6402 (patch) | |
| tree | b80de13c5c5432609a34d82b01149197923c35ce | |
| parent | ce547906aea7c085a71fa5c718cc5138fd439e68 (diff) | |
| parent | 3a3832700f1a61477931fac730200510ffa6bbb1 (diff) | |
| download | scala-96f33f50f3d12a4c5ac7ac1174c7762cc21a6402.tar.gz scala-96f33f50f3d12a4c5ac7ac1174c7762cc21a6402.tar.bz2 scala-96f33f50f3d12a4c5ac7ac1174c7762cc21a6402.zip | |
Merge branch 'dec10-version-string' into 2.8.x
| -rwxr-xr-x | tools/get-scala-revision | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/get-scala-revision b/tools/get-scala-revision index 3977a61040..b27b6ddc82 100755 --- a/tools/get-scala-revision +++ b/tools/get-scala-revision @@ -7,8 +7,8 @@ # not like releases come out so often that we are duty-bound # to recalculate this every time. -# git merge-base v2.9.1 master -devbase="d6f3184fc8" +# git merge-base v2.8.2 v2.9.1 master +devbase="df13e31bbb" # reimplementing git describe hopefully in a way which works # without any particular tags, branches, or recent versions of git. @@ -16,7 +16,9 @@ devbase="d6f3184fc8" # dev-NNNN-g<sha> # where NNNN is the number of commits since devbase, which # is the merge-base of the most recent release and master. -# Presently hardcoded to reduce uncertainty, v2.9.1/master. +# Presently hardcoded to reduce uncertainty, v2.8.2/v2.9.1/master. commits=$(git --no-pager log --pretty=oneline $devbase..HEAD | wc -l) sha=$(git rev-list -n 1 HEAD) -printf "dev-%s-g%s\n" $commits ${sha:0:7} +datestr=$(date "+%Y-%m-%d") + +printf "rdev-%s-%s-g%s\n" $commits $datestr ${sha:0:7} |