diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 11:58:38 -0400 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 12:09:35 -0400 |
commit | 1ca609715206679b41e72c012fa62641f4695175 (patch) | |
tree | 505a94ecec49ca8edb71fd5b2dfe529cdfb3141a | |
parent | 49b3e840ef06ff294fccb590919b66f427594e20 (diff) | |
download | scala-1ca609715206679b41e72c012fa62641f4695175.tar.gz scala-1ca609715206679b41e72c012fa62641f4695175.tar.bz2 scala-1ca609715206679b41e72c012fa62641f4695175.zip |
Fixed sha to not have the 'g' for git.
Swapped 'r' to 'v' now that I've had more coffee and sleep.
-rw-r--r-- | build.xml | 2 | ||||
-rwxr-xr-x | tools/get-scala-commit-sha | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -306,7 +306,7 @@ INITIALISATION value="${maven.version.number}-${git.commit.date}-${git.commit.drift}-${git.commit.sha}"/> <property name="osgi.version.number" - value="${version.major}.${version.minor}.${version.patch}.r${git.commit.date}${version.suffix}-${git.commit.sha}"/> + value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${version.suffix}-${git.commit.sha}"/> <!-- And print-out what we are building --> diff --git a/tools/get-scala-commit-sha b/tools/get-scala-commit-sha index 0aa70d985c..0abe31a53c 100755 --- a/tools/get-scala-commit-sha +++ b/tools/get-scala-commit-sha @@ -5,7 +5,7 @@ # If no dir is given, current working dir is used. # # Example build version string: -# g6f1c486d0b +# 6f1c486d0ba # [[ $# -eq 0 ]] || cd "$1" @@ -35,5 +35,6 @@ tag=$(git describe --tags --match 'v2*' --abbrev=0) described=$(git describe --tags --match 'v2*' --abbrev=10) suffix="${described##${tag}-}" hash=$(echo $suffix | cut -d - -f 2) +hash=${hash#g} echo "$hash" |