diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-14 01:04:45 -0400 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 12:05:37 -0400 |
commit | c3bff042546a343f260e2ef8be01665671db1043 (patch) | |
tree | e05185774a64eda84a0fe489c5cf05362444ebaf /build.xml | |
parent | f553ebb2dd0284805d8e49d48969ebde48ae2e25 (diff) | |
download | scala-c3bff042546a343f260e2ef8be01665671db1043.tar.gz scala-c3bff042546a343f260e2ef8be01665671db1043.tar.bz2 scala-c3bff042546a343f260e2ef8be01665671db1043.zip |
Fixes to build numbering system for 2.9.x release
Conflicts:
build.number
build.xml
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 41 |
1 files changed, 39 insertions, 2 deletions
@@ -236,7 +236,19 @@ INITIALISATION </touch> </target> - <target name="init" depends="init.jars"> + <!-- Determines OSGi string + maven extension. --> + <target name="init.build.snapshot" unless="build.release"> + <property name="version.suffix" value="DEV"/> + <property name="maven.version.suffix" value="-SNAPSHOT"/> + </target> + <target name="init.build.release" if="build.release"> + <property name="version.suffix" value="FINAL"/> + <property name="maven.version.suffix" value=""/> + </target> + + <target name="init.build.suffix.done" depends="init.build.snapshot, init.build.release"/> + + <target name="init" depends="init.jars, 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.) @@ -263,6 +275,18 @@ INITIALISATION <property name="version.number" value="-unknown-"/> <property name="init.avail" value="yes"/> + + <!-- Generating version number --> + <property file="${basedir}/build.number"/> + <!-- We use the git describe to determine the OSGi modifier for our build. --> + <property + name="version.number" + value="${version.major}.${version.minor}.${version.patch}.${version.suffix}-${git.describe}"/> + <!-- TODO - Use "DEV" vs. "FINAL" to determine if we're in release mode. --> + <property + name="maven.version.number" + value="${version.major}.${version.minor}.${version.patch}${maven.version.suffix}"/> + <!-- And print-out what we are building --> <echo message=" build time: ${time.human}" /> <echo message=" java version: ${java.vm.name} ${java.version}" /> @@ -270,7 +294,7 @@ INITIALISATION <echo message=" javac args: ${javac.args}" /> <echo message=" scalac args: ${scalac.args}" /> <echo message=" build number: ${version.number}" /> - + <!-- Local libs (developer use.) --> <mkdir dir="${lib-extra.dir}"/> @@ -293,7 +317,20 @@ INITIALISATION <path refid="lib.extra"/> </path> +<<<<<<< HEAD <!-- Define tasks that can be run with Starr --> +======= + <!-- And print-out what we are building --> + <echo message=" build time: ${time.human}" /> + <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=" maven version: ${maven.version.number}"/> + <echo message=" OSGi version: ${version.number}" /> + + <!-- Define tasks that can be run with Starr --> +>>>>>>> 6ec24f1611... Fixes to build numbering system for 2.9.x release <path id="starr.classpath"> <pathelement location="${lib.starr.jar}"/> <pathelement location="${comp.starr.jar}"/> |