Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

get rid of args element in staged-scalac

  • Loading branch information...
commit 5dca660a93086fca5aa59eda8bfa3a67e2d88fe1 1 parent a4785ba
@adriaanm adriaanm authored
Showing with 10 additions and 18 deletions.
  1. +10 −18 build.xml
View
28 build.xml
@@ -775,32 +775,27 @@ targets exercised:
<attribute name="args" default=""/> <!-- additional args -->
<attribute name="destproject" default="@{project}"/> <!-- overrides the output directory; used when building multiple projects into the same directory-->
<attribute name="srcdir" default="@{project}"/>
- <element name="args" implicit="true" optional="true"/>
<sequential>
<if><equals arg1="@{srcpath}" arg2="NOT SET"/><then>
<scalacfork taskname="@{stage}.@{project}"
- destdir="${build-@{stage}.dir}/classes/@{destproject}"
+ jvmargs="${scalacfork.jvmargs}"
compilerpathref="@{with}.compiler.path"
- params="${scalac.args.@{stage}} @{args}"
+ destdir="${build-@{stage}.dir}/classes/@{destproject}"
srcdir="${src.dir}/@{srcdir}"
- jvmargs="${scalacfork.jvmargs}">
+ params="${scalac.args.@{stage}} @{args}">
<include name="**/*.scala"/>
- <compilationpath refid="@{stage}.@{project}.build.path"/>
- <args/>
- </scalacfork></then>
+ <compilationpath refid="@{stage}.@{project}.build.path"/></scalacfork></then>
<else>
<scalacfork taskname="@{stage}.@{project}"
- destdir="${build-@{stage}.dir}/classes/@{destproject}"
+ jvmargs="${scalacfork.jvmargs}"
compilerpathref="@{with}.compiler.path"
- srcpath="@{srcpath}"
- params="${scalac.args.@{stage}} @{args}"
+ destdir="${build-@{stage}.dir}/classes/@{destproject}"
srcdir="${src.dir}/@{srcdir}"
- jvmargs="${scalacfork.jvmargs}">
+ srcpath="@{srcpath}"
+ params="${scalac.args.@{stage}} @{args}">
<include name="**/*.scala"/>
- <compilationpath refid="@{stage}.@{project}.build.path"/>
- <args/>
- </scalacfork></else>
+ <compilationpath refid="@{stage}.@{project}.build.path"/></scalacfork></else>
</if>
</sequential>
</macrodef>
@@ -1087,10 +1082,7 @@ targets exercised:
<!-- have to compile with quick compiler here! -->
<staged-scalac with="quick" stage="quick" project="plugins"
srcdir="continuations/library" destproject="continuations-library"
- args="-Xplugin-require:continuations -P:continuations:enable">
- <compilerarg value="-Xpluginsdir"/>
- <compilerarg file="${build-quick.dir}/misc/scala-devel/plugins"/>
- </staged-scalac>
+ args="-Xplugin-require:continuations -P:continuations:enable -Xpluginsdir ${build-quick.dir}/misc/scala-devel/plugins"/>
<stopwatch name="quick.plugins.timer" action="total"/>
</do>
Please sign in to comment.
Something went wrong with that request. Please try again.