diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-27 18:11:08 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-01 22:50:02 -0700 |
| commit | 5dca660a93086fca5aa59eda8bfa3a67e2d88fe1 (patch) | |
| tree | 8b1c1f7e38805c8d90f66bbeaa3ff54fa1913655 /build.xml | |
| parent | a4785baf83f8655399bcfe865962fe4d1ef48e59 (diff) | |
| download | scala-5dca660a93086fca5aa59eda8bfa3a67e2d88fe1.tar.gz scala-5dca660a93086fca5aa59eda8bfa3a67e2d88fe1.tar.bz2 scala-5dca660a93086fca5aa59eda8bfa3a67e2d88fe1.zip | |
get rid of args element in staged-scalac
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 28 |
1 files changed, 10 insertions, 18 deletions
@@ -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> |