diff options
-rw-r--r-- | build.xml | 23 |
1 files changed, 14 insertions, 9 deletions
@@ -203,9 +203,14 @@ INITIALISATION ============================================================================ --> <target name="init"> - <!-- The scalac.args.optimise is selectively overridden in certain antcall tasks. --> + <!-- 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 --> @@ -462,7 +467,7 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" srcpath="${src.dir}/library" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="scala/Predef.scala"/> @@ -475,7 +480,7 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" srcpath="${src.dir}/library" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -489,7 +494,7 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" srcpath="${src.dir}/library" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/actors" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -501,7 +506,7 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" srcpath="${src.dir}/library" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/dbc" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -513,7 +518,7 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" srcpath="${src.dir}/library" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/swing" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -562,7 +567,7 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/compiler" compilerpathref="locker.classpath" srcpath="${src.dir}/compiler" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/compiler" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -604,7 +609,7 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/scalap" compilerpathref="locker.classpath" srcpath="${src.dir}/scalap" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/scalap" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -646,7 +651,7 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/partest" compilerpathref="locker.classpath" srcpath="${src.dir}/partest" - params="${scalac.args.all}" + params="${scalac.args.quick}" srcdir="${src.dir}/partest" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> |