diff options
| author | Paul Phillips <paulp@improving.org> | 2011-11-29 18:10:11 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-11-29 18:10:11 +0000 |
| commit | 9c4f14411f1aac5d106aa4a2a404c7d231752478 (patch) | |
| tree | b85488121bc42ef8d8cc6eb5d3cf92bea226da8b /build.xml | |
| parent | 6dbd2dac2750db552b42518d7203c7047975831c (diff) | |
| download | scala-9c4f14411f1aac5d106aa4a2a404c7d231752478.tar.gz scala-9c4f14411f1aac5d106aa4a2a404c7d231752478.tar.bz2 scala-9c4f14411f1aac5d106aa4a2a404c7d231752478.zip | |
Fix for build.xml classpaths.
Found the cause of plugin build failures which have long haunted me at
inopportune times. It's all built against locker instead of quick. Kind
of a buzzkill to be fixing this during the "Ant End Times" but better
now than never.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -390,6 +390,11 @@ LOCAL REFERENCE BUILD (LOCKER) <pathelement location="${build-locker.dir}/classes/compiler"/> <path refid="aux.libs"/> </path> + <path id="quick.classpath"> + <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/compiler"/> + <path refid="aux.libs"/> + </path> </target> <target name="locker.clean" depends="palo.clean"> @@ -610,7 +615,7 @@ QUICK BUILD (QUICK) <mkdir dir="${build-quick.dir}/classes/continuations-plugin"/> <scalacfork destdir="${build-quick.dir}/classes/continuations-plugin" - compilerpathref="locker.classpath" + compilerpathref="quick.classpath" params="${scalac.args.quick}" srcdir="${src.dir}/continuations/plugin" jvmargs="${scalacfork.jvmargs}"> @@ -633,7 +638,7 @@ QUICK BUILD (QUICK) <!-- might split off library part into its own ant target --> <scalacfork destdir="${build-quick.dir}/classes/library" - compilerpathref="locker.classpath" + compilerpathref="quick.classpath" params="${scalac.args.quick} -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> @@ -650,7 +655,7 @@ QUICK BUILD (QUICK) <mkdir dir="${build-quick.dir}/classes/scalacheck"/> <scalacfork destdir="${build-quick.dir}/classes/scalacheck" - compilerpathref="locker.classpath" + compilerpathref="quick.classpath" params="${scalac.args.all}" srcdir="${src.dir}/scalacheck" jvmargs="${scalacfork.jvmargs}"> @@ -673,7 +678,7 @@ QUICK BUILD (QUICK) <mkdir dir="${build-quick.dir}/classes/scalap"/> <scalacfork destdir="${build-quick.dir}/classes/scalap" - compilerpathref="locker.classpath" + compilerpathref="quick.classpath" params="${scalac.args.quick}" srcdir="${src.dir}/scalap" jvmargs="${scalacfork.jvmargs}"> @@ -715,7 +720,7 @@ QUICK BUILD (QUICK) </javac> <scalacfork destdir="${build-quick.dir}/classes/partest" - compilerpathref="locker.classpath" + compilerpathref="quick.classpath" params="${scalac.args.quick}" srcdir="${src.dir}/partest" jvmargs="${scalacfork.jvmargs}"> |