diff options
| author | Stefan Zeiger <szeiger@novocode.com> | 2011-11-23 12:03:50 +0000 |
|---|---|---|
| committer | Stefan Zeiger <szeiger@novocode.com> | 2011-11-23 12:03:50 +0000 |
| commit | f191dca582e47c8f01a030191c960e25411de0a4 (patch) | |
| tree | 35c3b04ab9767d246db396e54d6ec9ab1eb9e6c7 /build.xml | |
| parent | 25ecde037f22ff92df5459aaa5360a9760f1f05f (diff) | |
| download | scala-f191dca582e47c8f01a030191c960e25411de0a4.tar.gz scala-f191dca582e47c8f01a030191c960e25411de0a4.tar.bz2 scala-f191dca582e47c8f01a030191c960e25411de0a4.zip | |
Enabling the use of 'compilerarg' with 'scalacf...
Enabling the use of 'compilerarg' with 'scalacfork' task in the build
process.
'compilerarg' was added in r26030 and pushed into starr with r26055. No
review.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -634,15 +634,13 @@ QUICK BUILD (QUICK) <scalacfork destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" - params="${scalac.args.quick} -Xpluginsdir ${build-quick.dir}/misc/scala-devel/plugins -Xplugin-require:continuations -P:continuations:enable" + params="${scalac.args.quick} -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath refid="quick.compilation.path"/> - <!-- TODO: Enable this and remove from params above when "compilerarg" is in starr <compilerarg value="-Xpluginsdir"/> <compilerarg file="${build-quick.dir}/misc/scala-devel/plugins"/> - --> </scalacfork> <touch file="${build-quick.dir}/plugins.complete" verbose="no"/> <stopwatch name="quick.plugins.timer" action="total"/> @@ -1151,15 +1149,13 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" - params="${scalac.args.all} -Xpluginsdir ${build-strap.dir}/misc/scala-devel/plugins -Xplugin-require:continuations -P:continuations:enable" + params="${scalac.args.all} -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath refid="strap.compilation.path"/> - <!-- TODO: Enable this and remove from params above when "compilerarg" is in starr <compilerarg value="-Xpluginsdir"/> <compilerarg file="${build-strap.dir}/misc/scala-devel/plugins"/> - --> </scalacfork> <touch file="${build-strap.dir}/plugins.complete" verbose="no"/> <stopwatch name="strap.plugins.timer" action="total"/> |