diff options
Diffstat (limited to 'build.xml')
| -rw-r--r--[-rwxr-xr-x] | build.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/build.xml b/build.xml index 589e1931b8..7f8c91b47b 100755..100644 --- a/build.xml +++ b/build.xml @@ -184,7 +184,7 @@ TODO: <property name="dists.dir" value="${basedir}/dists"/> - <property name="copyright.string" value="Copyright 2002-2013, LAMP/EPFL"/> + <property name="copyright.string" value="Copyright 2002-2015, LAMP/EPFL"/> <!-- These are NOT the flags used to run SuperSabbus, but the ones written into the script runners created with scala.tools.ant.ScalaTool --> @@ -506,6 +506,11 @@ TODO: </condition> <fail if="has.unsupported.jdk" message="JDK ${ant.java.version} is not supported by this build!"/> + <fail message="Ant 1.9+ required"> + <condition> + <not><antversion atleast="1.9" /></not> + </condition> + </fail> <!-- Allow this to be overridden simply --> <property name="sbt.latest.version" value="0.12.4"/> @@ -802,6 +807,7 @@ TODO: <path id="quick.repl.build.path"> <path refid="quick.compiler.build.path"/> + <path refid="quick.interactive.build.path"/> <pathelement location="${build-quick.dir}/classes/repl"/> </path> @@ -842,7 +848,7 @@ TODO: </path> <path id="quick.bin.tool.path"> - <path refid="quick.repl.build.path"/> + <path refid="quick.repl-jline.build.path"/> <path refid="quick.actors.build.path"/> <pathelement location="${build-quick.dir}/classes/scalap"/> <pathelement location="${build-quick.dir}/classes/scaladoc"/> @@ -1168,7 +1174,7 @@ TODO: <target name="quick.comp" depends="quick.reflect"> <staged-build with="locker" stage="quick" project="compiler"/> </target> - <target name="quick.repl" depends="quick.comp"> + <target name="quick.repl" depends="quick.comp, quick.interactive"> <staged-build with="locker" stage="quick" project="repl"/> <staged-build with="locker" stage="quick" project="repl-jline"/> @@ -1196,7 +1202,7 @@ TODO: </target> <target name="quick.scaladoc" depends="quick.comp"> - <staged-build with="locker" stage="quick" project="scaladoc" version="scaladoc"/> </target> + <staged-build with="locker" stage="quick" project="scaladoc"/> </target> <target name="quick.interactive" depends="quick.comp, quick.scaladoc"> <staged-build with="locker" stage="quick" project="interactive"/> </target> |