Skip to content

Commit 62422f3

Browse files
jsuerethjsuereth
committed
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.
1 parent fb44bb2 commit 62422f3

File tree

4 files changed

+4
-44
lines changed

4 files changed

+4
-44
lines changed

‎build.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,7 @@ INITIALISATION
285285
<exec osfamily="windows" executable="tools/get-scala-commit-sha.bat" outputproperty="git.commit.sha" failifexecutionfails="false" />
286286
<exec osfamily="unix" executable="tools/get-scala-commit-date" outputproperty="git.commit.date" failifexecutionfails="false" />
287287
<exec osfamily="windows" executable="tools/get-scala-commit-date.bat" outputproperty="git.commit.date" failifexecutionfails="false" />
288-
<exec osfamily="unix" executable="tools/get-scala-commit-drift" outputproperty="git.commit.drift" failifexecutionfails="false" />
289-
<exec osfamily="windows" executable="tools/get-scala-commit-drift.bat" outputproperty="git.commit.drift" failifexecutionfails="false" />
290288
<!-- some default in case something went wrong getting the revision -->
291-
<property name="git.commit.drift" value="00000000"/>
292289
<property name="git.commit.sha" value="unknown"/>
293290
<property name="git.commit.date" value="unknown"/>
294291

@@ -298,7 +295,7 @@ INITIALISATION
298295
value="${version.major}.${version.minor}.${version.patch}${version.suffix}${maven.version.suffix}"/>
299296
<property
300297
name="version.number"
301-
value="${maven.version.number}-${git.commit.date}-${git.commit.drift}-${git.commit.sha}"/>
298+
value="${version.major}.${version.minor}.${version.patch}${version.suffix}-${git.commit.date}-${git.commit.sha}"/>
302299
<property
303300
name="osgi.version.number"
304301
value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${version.suffix}-${git.commit.sha}"/>
@@ -334,8 +331,8 @@ INITIALISATION
334331
<echo message=" java args: ${env.ANT_OPTS} ${jvm.opts}" />
335332
<echo message=" javac args: ${javac.args}" />
336333
<echo message=" scalac args: ${scalac.args}" />
334+
<echo message=" git date: ${git.commit.date}" />
337335
<echo message=" git hash: ${git.commit.sha}" />
338-
<echo message=" git drift: ${git.commit.drift}" />
339336
<echo message=" maven version: ${maven.version.number}"/>
340337
<echo message=" OSGi version: ${osgi.version.number}" />
341338
<echo message="canonical version: ${version.number}" />

‎tools/get-scala-commit-date

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
[[ $# -eq 0 ]] || cd "$1"
1212

1313
lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
14+
lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
1415

1516
# 20120324
16-
echo "${lastcommitdate//-/}"
17+
echo "${lastcommitdate//-/}-${lastcommithours//:/}"

‎tools/get-scala-commit-drift

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎tools/get-scala-commit-drift.bat

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)