summaryrefslogtreecommitdiff
path: root/tools/get-scala-revision
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-12-02 05:36:03 -0800
committerPaul Phillips <paulp@improving.org>2011-12-04 17:20:50 -0800
commita289465c70630719cbd3a74edf5502a156ef83c4 (patch)
treec1c5d6add5b0c9d4e8d94b6b8f3456245ae4576b /tools/get-scala-revision
parenta17908694b89115026f587bcb8a8ed6d16768cad (diff)
downloadscala-a289465c70630719cbd3a74edf5502a156ef83c4.tar.gz
scala-a289465c70630719cbd3a74edf5502a156ef83c4.tar.bz2
scala-a289465c70630719cbd3a74edf5502a156ef83c4.zip
Use git-describe to create build string.
Created dev tag which is the merge-base of master and 2.9.1 (merge-base is the last common commit), and told ant to generate build strings based on that. So distributions look like scala-2.10.0.dev-1289-gbba3918 Where the 1289 means you are 1289 commits ahead of "dev" and the last segment (minus the g) is the sha-1 hash. This no doubt breaks windows even further. Help getting it back on its feet greatly appreciated.
Diffstat (limited to 'tools/get-scala-revision')
-rwxr-xr-xtools/get-scala-revision28
1 files changed, 5 insertions, 23 deletions
diff --git a/tools/get-scala-revision b/tools/get-scala-revision
index 8731705d06..23b216aa2b 100755
--- a/tools/get-scala-revision
+++ b/tools/get-scala-revision
@@ -1,30 +1,12 @@
#!/bin/sh
#
# Usage: get-scala-revision [dir]
-# Figures out current scala revision of an svn checkout or
-# a git-svn mirror (or a git clone.)
+# Figures out current scala revision of a git clone.
#
# If no dir is given, current working dir is used.
-DIR=""
-if [ $# -eq 0 ]; then
- DIR=`pwd`
-else
- DIR=$1
-fi
+[[ -n "$1" ]] && cd "$1"
-cd $DIR
-
-if [ -d .svn ]; then
- # 2>&1 to catch also error output (e.g. svn warnings)
- svn info . 2>&1 | grep ^Revision | sed 's/Revision: //'
-elif [ -d .git ]; then
- GIT_PAGER=cat
- # this grabs more than one line because otherwise if you have local
- # commits which aren't in git-svn it won't see any revision.
- git log -10 | grep git-svn-id | head -1 | sed 's/[^@]*@\([0-9]*\).*/\1/'
-else
- echo "${DIR} doesn't appear to be git or svn dir." >&2
- echo 0
- exit 1
-fi
+# dev should be a tag at the merge-base of master and the
+# most recent release.
+git describe head --abbrev=7 --match dev