Skip to content
Browse files

Tagged builds now display tag version. (maven = canonical).

  • Loading branch information...
1 parent c9e254e commit 949a4804e4312774b05373903019108d7574fe65 @jsuereth jsuereth committed Mar 30, 2012
Showing with 34 additions and 20 deletions.
  1. +34 −20 build.xml
View
54 build.xml
@@ -236,21 +236,7 @@ INITIALISATION
<target name="init.build.suffix.done" depends="init.build.release, init.build.patch.release"/>
- <target name="init" depends="init.starr, init.build.suffix.done">
- <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. -->
- <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.all" value="${scalac.args} ${scalac.args.optimise}"/>
- <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/>
- <!-- Setting-up Ant contrib tasks -->
- <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/>
- <!-- This is the start time for the distribution -->
- <tstamp prefix="time">
- <format property="human" pattern="d MMMM yyyy, HH:mm:ss"/>
- <format property="short" pattern="yyyyMMddHHmmss"/>
- </tstamp>
+ <target name="init.version.git" depends="init.build.suffix.done">
<!-- Find out whether we are running on Windows -->
<condition property="os.win">
<os family="windows"/>
@@ -262,18 +248,46 @@ INITIALISATION
<property name="git.commit.sha" value="unknown"/>
<property name="git.commit.date" value="unknown"/>
- <property name="init.avail" value="yes"/>
-
<!-- We use the git describe to determine the OSGi modifier for our build. -->
<property
name="maven.version.number"
value="${version.major}.${version.minor}.${version.patch}${version.suffix}${maven.version.suffix}"/>
<property
- name="version.number"
- 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}"/>
+ </target>
+
+ <target name="init.version.snapshot" unless="build.release" depends="init.version.git">
+ <property
+ name="version.number"
+ value="${version.major}.${version.minor}.${version.patch}${version.suffix}-${git.commit.date}-${git.commit.sha}"/>
+ </target>
+
+ <target name="init.version.release" if="build.release" depends="init.version.git">
+ <property
+ name="version.number"
+ value="${maven.version.number}"/>
+ </target>
+
+ <target name="init.version.done" depends="init.version.release, init.version.snapshot"/>
+
+ <target name="init" depends="init.starr, init.version.done">
+ <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. -->
+ <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.all" value="${scalac.args} ${scalac.args.optimise}"/>
+ <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/>
+ <!-- Setting-up Ant contrib tasks -->
+ <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/>
+ <!-- This is the start time for the distribution -->
+ <tstamp prefix="time">
+ <format property="human" pattern="d MMMM yyyy, HH:mm:ss"/>
+ <format property="short" pattern="yyyyMMddHHmmss"/>
+ </tstamp>
+
+ <property name="init.avail" value="yes"/>
<!-- Local libs (developer use.) -->

0 comments on commit 949a480

Please sign in to comment.
Something went wrong with that request. Please try again.