Permalink
Browse files

Moved interactive sources into separate directory.

As with the preceding commit, this has build-internal
effects only.
  • Loading branch information...
paulp authored and adriaanm committed Mar 6, 2013
1 parent c6ca941 commit e83defaa29bf8d7ed742a611c301ee8b04e971b8
Showing with 33 additions and 1 deletion.
  1. +33 −1 build.xml
  2. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/CompilerControl.scala
  3. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/ContextTrees.scala
  4. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/Global.scala
  5. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/InteractiveReporter.scala
  6. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/Picklers.scala
  7. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/PresentationCompilerThread.scala
  8. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/REPL.scala
  9. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/RangePositions.scala
  10. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/Response.scala
  11. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/RichCompilationUnits.scala
  12. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/ScratchPadMaker.scala
  13. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/InteractiveTest.scala
  14. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/InteractiveTestSettings.scala
  15. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/Tester.scala
  16. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/core/AskCommand.scala
  17. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala
  18. 0 ...compiler → interactive}/scala/tools/nsc/interactive/tests/core/PresentationCompilerInstance.scala
  19. 0 ...interactive}/scala/tools/nsc/interactive/tests/core/PresentationCompilerRequestsWorkingMode.scala
  20. 0 ...{compiler → interactive}/scala/tools/nsc/interactive/tests/core/PresentationCompilerTestDef.scala
  21. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/core/Reporter.scala
  22. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/core/SourcesCollector.scala
  23. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/core/TestMarker.scala
  24. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/core/TestResources.scala
  25. 0 src/{compiler → interactive}/scala/tools/nsc/interactive/tests/core/TestSettings.scala
View
@@ -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"/>

0 comments on commit e83defa

Please sign in to comment.