Yet another attempt to make the version a good one

This fixes the git commit drift issue and gives us enough granularity
to make releases at any time that are cronologically increasing.

4 files changed, 4 insertions, 44 deletions

diff --git a/build.xml b/build.xml
index 31a9e5a1d1..65a702423d 100644
--- a/build.xml
+++ b/build.xml
@@ -260,10 +260,7 @@ INITIALISATION
     <exec osfamily="windows" executable="tools/get-scala-commit-sha.bat" outputproperty="git.commit.sha" failifexecutionfails="false" />
     <exec osfamily="unix" executable="tools/get-scala-commit-date" outputproperty="git.commit.date" failifexecutionfails="false" />
     <exec osfamily="windows" executable="tools/get-scala-commit-date.bat" outputproperty="git.commit.date" failifexecutionfails="false" />
-    <exec osfamily="unix" executable="tools/get-scala-commit-drift" outputproperty="git.commit.drift" failifexecutionfails="false" />
-    <exec osfamily="windows" executable="tools/get-scala-commit-drift.bat" outputproperty="git.commit.drift" failifexecutionfails="false" />
     <!-- some default in case something went wrong getting the revision -->
-    <property name="git.commit.drift" value="00000000"/>
     <property name="git.commit.sha" value="unknown"/>
     <property name="git.commit.date" value="unknown"/>
 
@@ -275,7 +272,7 @@ INITIALISATION
       value="${version.major}.${version.minor}.${version.patch}${version.suffix}${maven.version.suffix}"/>
     <property
       name="version.number"
-      value="${maven.version.number}-${git.commit.date}-${git.commit.drift}-${git.commit.sha}"/>
+      value="${version.major}.${version.minor}.${version.patch}${version.suffix}-${git.commit.date}-${git.commit.sha}"/>
     <property
       name="osgi.version.number"
       value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${version.suffix}-${git.commit.sha}"/>
@@ -309,8 +306,8 @@ INITIALISATION
     <echo message="        java args: ${env.ANT_OPTS} ${jvm.opts}" />
     <echo message="       javac args: ${javac.args}" />
     <echo message="      scalac args: ${scalac.args}" />
+    <echo message="         git date: ${git.commit.date}" />
     <echo message="         git hash: ${git.commit.sha}" />
-    <echo message="        git drift: ${git.commit.drift}" />
     <echo message="    maven version: ${maven.version.number}"/>
     <echo message="     OSGi version: ${osgi.version.number}" />
     <echo message="canonical version: ${version.number}" />
diff --git a/tools/get-scala-commit-date b/tools/get-scala-commit-date
index ef5b0f540d..b2e4e10770 100755
--- a/tools/get-scala-commit-date
+++ b/tools/get-scala-commit-date
@@ -11,6 +11,7 @@
 [[ $# -eq 0 ]] || cd "$1"
 
 lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
+lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
 
 # 20120324
-echo "${lastcommitdate//-/}"
+echo "${lastcommitdate//-/}-${lastcommithours//:/}"
diff --git a/tools/get-scala-commit-drift b/tools/get-scala-commit-drift
deleted file mode 100755
index 1395c92c3d..0000000000
--- a/tools/get-scala-commit-drift
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#
-# Usage: get-scala-commit-drift [dir]
-# Figures out current commit drift of a git clone.
-# If no dir is given, current working dir is used.
-#
-# Example output string:
-#   123
-#
-# Build drift = # of commits since last tag.
-
-[[ $# -eq 0 ]] || cd "$1"
-
-# git describe is completely useles to us if we're on a tag, or haven't changed since then.
-# This at least gives us a total number of commits included in a release, which should grow steadily.
-counter=$(git shortlog | grep -E '^[ ]+\w+' | wc -l)
-printf "%08d" "$counter"
diff --git a/tools/get-scala-commit-drift.bat b/tools/get-scala-commit-drift.bat
deleted file mode 100644
index ac289d3481..0000000000
--- a/tools/get-scala-commit-drift.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-rem
-rem Usage: get-scala-commit-drift.bat [dir]
-rem Figures out current scala commit drift, of a clone.
-rem
-rem If no dir is given, current working dir is used.
-
-@setlocal
-set _DIR=
-if "%*"=="" (
-  for /f "delims=;" %%i in ('cd') do set "_DIR=%%i"
-) else (
-  set "_DIR=%~1"
-)
-cd %_DIR%
-
-rem  TODO - WRITE THIS
-echo "TODO"
-
-:end
-@endlocal