summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.xml42
1 files changed, 42 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index 5c9c83ba2d..76d04b1282 100644
--- a/build.xml
+++ b/build.xml
@@ -482,6 +482,20 @@ LOCAL REFERENCE BUILD (LOCKER)
<target name="locker.comp" depends="locker.pre-comp" if="locker.comp.needed">
<stopwatch name="locker.comp.timer"/>
<mkdir dir="${build-locker.dir}/classes/compiler"/>
+ <!-- TODO If we have cross dependencies, move this below scalacfork... -->
+ <javac
+ srcdir="${src.dir}/compiler"
+ destdir="${build-locker.dir}/classes/compiler"
+ includes="**/*.java"
+ target="1.5" source="1.5">
+ <compilerarg line="${javac.args}"/>
+ <classpath>
+ <pathelement location="${build-locker.dir}/classes/library"/>
+ <pathelement location="${build-locker.dir}/classes/compiler"/>
+ <path refid="aux.libs"/>
+ <pathelement location="${jline.jar}"/>
+ </classpath>
+ </javac>
<scalacfork
destdir="${build-locker.dir}/classes/compiler"
compilerpathref="starr.classpath"
@@ -766,6 +780,20 @@ QUICK BUILD (QUICK)
<target name="quick.comp" depends="quick.pre-comp" unless="quick.comp.available">
<stopwatch name="quick.comp.timer"/>
<mkdir dir="${build-quick.dir}/classes/compiler"/>
+ <!-- TODO If we have cross dependencies, move this below scalacfork... -->
+ <javac
+ srcdir="${src.dir}/compiler"
+ destdir="${build-quick.dir}/classes/compiler"
+ includes="**/*.java"
+ target="1.5" source="1.5">
+ <compilerarg line="${javac.args}"/>
+ <classpath>
+ <pathelement location="${build-quick.dir}/classes/library"/>
+ <pathelement location="${build-quick.dir}/classes/compiler"/>
+ <path refid="aux.libs"/>
+ <pathelement location="${jline.jar}"/>
+ </classpath>
+ </javac>
<scalacfork
destdir="${build-quick.dir}/classes/compiler"
compilerpathref="locker.classpath"
@@ -1287,6 +1315,20 @@ BOOTSTRAPPING BUILD (STRAP)
<target name="strap.comp" depends="strap.pre-comp" unless="strap.comp.available">
<stopwatch name="strap.comp.timer"/>
<mkdir dir="${build-strap.dir}/classes/compiler"/>
+ <!-- TODO If we have cross dependencies, move this below scalacfork... -->
+ <javac
+ srcdir="${src.dir}/compiler"
+ destdir="${build-strap.dir}/classes/compiler"
+ includes="**/*.java"
+ target="1.5" source="1.5">
+ <compilerarg line="${javac.args}"/>
+ <classpath>
+ <pathelement location="${build-strap.dir}/classes/library"/>
+ <pathelement location="${build-strap.dir}/classes/compiler"/>
+ <path refid="aux.libs"/>
+ <pathelement location="${jline.jar}"/>
+ </classpath>
+ </javac>
<scalacfork
destdir="${build-strap.dir}/classes/compiler"
compilerpathref="pack.classpath"