Skip to content

Commit

Permalink
Enabling the use of 'compilerarg' with 'scalacf...
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
szeiger committed Nov 23, 2011
1 parent 25ecde0 commit f191dca
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand Down

0 comments on commit f191dca

Please sign in to comment.