From 7d2db571b41f3c23e91ad27ee5b81a421f312e00 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Fri, 9 Dec 2011 20:45:52 -0800
Subject: Hardening get-scala-version.

Reimplementing without git-describe to harden against old
gits and make any kind of reference tag unnecessary.

Conflicts:

	tools/get-scala-revision
---
 tools/get-scala-revision | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 tools/get-scala-revision

(limited to 'tools/get-scala-revision')

diff --git a/tools/get-scala-revision b/tools/get-scala-revision
new file mode 100755
index 0000000000..dc0ee561dd
--- /dev/null
+++ b/tools/get-scala-revision
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# Usage: get-scala-revision [dir]
+# Figures out current scala revision of a git clone.
+#
+# If no dir is given, current working dir is used.
+
+# 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"
+
+# reimplementing git describe hopefully in a way which works
+# without any particular tags, branches, or recent versions of git.
+# this is supposed to generate
+#     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.
+commits=$(GIT_PAGER=cat git log --oneline $devbase..HEAD | wc -l)
+sha=$(git log -1 --abbrev-commit --abbrev=7 --format="%h")
+printf "dev-%s-g%s\n" $commits $sha
-- 
cgit v1.2.3


From a348cc3f8310bee4b3053412106ecbc21718cc83 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Fri, 9 Dec 2011 21:33:13 -0800
Subject: More on get-scala-revision.

Now that I've resorted to building git 1.5.4, I can stop trying
to reverse engineer it through jenkins.  This implementation feels
winnerish.
---
 tools/get-scala-revision | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/get-scala-revision')

diff --git a/tools/get-scala-revision b/tools/get-scala-revision
index dc0ee561dd..3977a61040 100755
--- a/tools/get-scala-revision
+++ b/tools/get-scala-revision
@@ -17,6 +17,6 @@ devbase="d6f3184fc8"
 # 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.
-commits=$(GIT_PAGER=cat git log --oneline $devbase..HEAD | wc -l)
-sha=$(git log -1 --abbrev-commit --abbrev=7 --format="%h")
-printf "dev-%s-g%s\n" $commits $sha
+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}
-- 
cgit v1.2.3


From 3a3832700f1a61477931fac730200510ffa6bbb1 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Mon, 12 Dec 2011 12:56:23 -0800
Subject: Tweaking build string some more.

Reintroduced date and an "r" to meet IDE needs.  Moved reference
commit backward to accomodate 2.8.x.  Merging changes into 2.8.x,
2.9.x, and master.
---
 tools/get-scala-revision | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tools/get-scala-revision')

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}
-- 
cgit v1.2.3