diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-12 13:50:48 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-12 13:50:48 -0800 |
| commit | e8efc9a0337a3fc6ab5f8a0756cdc28f44f176a1 (patch) | |
| tree | e38610a67822f2cdbb8d0ca21d3eefc7db08a578 /build.xml | |
| parent | c6dedf91dc02079914160b87dabb4e0ef640b049 (diff) | |
| parent | 5c7086b3c89ef5b7483bf5750b31dd76ab8b0cee (diff) | |
| download | scala-e8efc9a0337a3fc6ab5f8a0756cdc28f44f176a1.tar.gz scala-e8efc9a0337a3fc6ab5f8a0756cdc28f44f176a1.tar.bz2 scala-e8efc9a0337a3fc6ab5f8a0756cdc28f44f176a1.zip | |
Merge branch 'dec10-version-string'
Conflicts:
build.xml
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -213,8 +213,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 --> @@ -233,7 +232,6 @@ INITIALISATION <exec osfamily="windows" executable="tools/get-scala-revision.bat" outputproperty="git.describe" failifexecutionfails="false" /> <!-- some default in case something went wrong getting the revision --> <property name="git.describe" value="-unknown-"/> - <property name="init.avail" value="yes"/> <!-- Generating version number --> @@ -241,7 +239,7 @@ INITIALISATION <property name="version.number" value="${version.major}.${version.minor}.${version.patch}.${git.describe}"/> - + <!-- And print-out what we are building --> <echo message=" build time: ${time.human}" /> <echo message=" java version: ${java.vm.name} ${java.version}" /> |