diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-06 08:05:12 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-09 11:59:11 -0800 |
commit | e83defaa29bf8d7ed742a611c301ee8b04e971b8 (patch) | |
tree | 3dbacf0cde8a4a8801b3a40a685ffd8ac6c624b0 /build.xml | |
parent | c6ca941ccc017a8869f4def717cfeb640f965077 (diff) | |
download | scala-e83defaa29bf8d7ed742a611c301ee8b04e971b8.tar.gz scala-e83defaa29bf8d7ed742a611c301ee8b04e971b8.tar.bz2 scala-e83defaa29bf8d7ed742a611c301ee8b04e971b8.zip |
Moved interactive sources into separate directory.
As with the preceding commit, this has build-internal
effects only.
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 34 |
1 files changed, 33 insertions, 1 deletions
@@ -1316,7 +1316,38 @@ QUICK BUILD (QUICK) <touch file="${build-quick.dir}/scaladoc.complete" verbose="no"/> </target> - <target name="quick.pre-bin" depends="quick.scaladoc"> + <target name="quick.pre-interactive" depends="quick.scaladoc"> + <uptodate property="quick.interactive.available" targetfile="${build-quick.dir}/interactive.complete"> + <srcfiles dir="${src.dir}/interactive" /> + </uptodate> + </target> + + <target name="quick.interactive" depends="quick.pre-interactive" unless="quick.interactive.available"> + <mkdir dir="${build-quick.dir}/classes/interactive"/> + <scalacfork + destdir="${build-quick.dir}/classes/interactive" + compilerpathref="quick.classpath" + params="${scalac.args.quick}" + srcdir="${src.dir}/interactive" + jvmargs="${scalacfork.jvmargs}"> + <include name="**/*.scala"/> + <compilationpath> + <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${build-quick.dir}/classes/reflect"/> + <pathelement location="${build-quick.dir}/classes/compiler"/> + <pathelement location="${build-quick.dir}/classes/scalap"/> + <pathelement location="${build-quick.dir}/classes/partest"/> + <pathelement location="${build-quick.dir}/classes/scaladoc"/> + <pathelement location="${build-quick.dir}/classes/interactive"/> + <pathelement location="${ant.jar}"/> + <path refid="forkjoin.classpath"/> + <pathelement location="${scalacheck.jar}"/> + </compilationpath> + </scalacfork> + <touch file="${build-quick.dir}/interactive.complete" verbose="no"/> + </target> + + <target name="quick.pre-bin" depends="quick.interactive"> <condition property="quick.bin.available"> <isset property="quick.comp.available"/> </condition> @@ -1456,6 +1487,7 @@ PACKED QUICK BUILD (PACK) <jar destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF"> <fileset dir="${build-quick.dir}/classes/compiler"/> <fileset dir="${build-quick.dir}/classes/scaladoc"/> + <fileset dir="${build-quick.dir}/classes/interactive"/> <fileset dir="${build-asm.dir}/classes"/> </jar> <copy file="${jline.jar}" toDir="${build-pack.dir}/lib"/> |