diff options
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -266,7 +266,7 @@ INITIALISATION <property name="scalac.args.optimise" value=""/> <!-- scalac.args.quickonly are added to quick.* targets but not others (particularly, locker.) This is to facilitate testing new command line options which do not yet exist in starr. --> - <property name="scalac.args.quickonly" value=""/> + <property name="scalac.args.quickonly" value=""/> <property name="scalac.args.all" value="${scalac.args} ${scalac.args.optimise}"/> <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/> <!-- Setting-up Ant contrib tasks --> @@ -285,10 +285,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"/> @@ -298,7 +295,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}"/> @@ -333,9 +330,9 @@ INITIALISATION <echo message=" java version: ${java.vm.name} ${java.version}" /> <echo message=" java args: ${env.ANT_OPTS} ${jvm.opts}" /> <echo message=" javac args: ${javac.args}" /> - <echo message=" scalac args: ${scalac.args}" /> + <echo message=" scalac args: ${scalac.args.all}" /> + <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}" /> |