diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-20 08:57:44 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-23 11:36:09 -0400 |
| commit | b1d438034c20d0f4329a184304788732d9b530c6 (patch) | |
| tree | d6a4f13d488714da92fb03aa8821a714ffe8de53 /build.xml | |
| parent | 4fa90f1c812b48f3c18ad67e08f06d61029650fb (diff) | |
| download | scala-b1d438034c20d0f4329a184304788732d9b530c6.tar.gz scala-b1d438034c20d0f4329a184304788732d9b530c6.tar.bz2 scala-b1d438034c20d0f4329a184304788732d9b530c6.zip | |
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.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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}" /> |