From c3bff042546a343f260e2ef8be01665671db1043 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Wed, 14 Mar 2012 01:04:45 -0400
Subject: Fixes to build numbering system for 2.9.x release

Conflicts:

	build.number
	build.xml
---
 tools/get-scala-revision     | 4 ++--
 tools/get-scala-revision.bat | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/get-scala-revision b/tools/get-scala-revision
index 4d97ec58ad..14c84d0ad4 100755
--- a/tools/get-scala-revision
+++ b/tools/get-scala-revision
@@ -40,5 +40,5 @@ hash=$(echo $suffix | cut -d - -f 2)
 # remove any alphabetic characters before the version number
 tag=$(echo $tag | sed "s/\([a-z_A-Z]*\)\(.*\)/\2/")
 
-# 2.10.0-M1-0098-g6f1c486d0b-2012-02-01
-printf "%s-%04d-%s-%s\n" "$tag" "$counter" "$hash" $(date "+%Y-%m-%d")
+# 20120324-123-b0d78f7b9c
+printf "%s-%04d-%s\n" $(date "+%Y%m%d") "$counter" "$hash" 
diff --git a/tools/get-scala-revision.bat b/tools/get-scala-revision.bat
index 48c7cbd94f..b5b30eb3a8 100644
--- a/tools/get-scala-revision.bat
+++ b/tools/get-scala-revision.bat
@@ -14,9 +14,14 @@ if "%*"=="" (
 )
 cd %_DIR%
 
+rem  TODO - Look up bat scripting example and fix the darn string.
 if exist .git\NUL (
   git describe --abbrev=10 --always --tags
 )
 
+rem  Implement something like the following
+rem for /f "tokens=1,2,3 delims=- " %%a in ("%gitdescribe%") do set version=%%a&set commits=%%b&set sha=%%c
+rem echo %date?%-%commits%-%sha%
+
 :end
 @endlocal
-- 
cgit v1.2.3