luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move compiler integration classes to subproject compile/integration

This commit is contained in:
Mark Harrah 2012-04-18 03:33:49 -04:00
parent 882ab1e4e8
commit db7ec09591
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
main/actions/AggressiveCompile.scala → compile/integration/AggressiveCompile.scala
View File

10
main/actions/Compiler.scala → compile/integration/Compiler.scala
View File

@ -13,16 +13,6 @@ object Compiler
{
val DefaultMaxErrors = 100
def allProblems(inc: Incomplete): Seq[Problem] =
allProblems(inc :: Nil)
def allProblems(incs: Seq[Incomplete]): Seq[Problem] =
problems(Incomplete.allExceptions(incs).toSeq)
def problems(es: Seq[Throwable]): Seq[Problem] =
es flatMap {
case cf: xsbti.CompileFailed => cf.problems
case _ => Nil
}
final case class Inputs(compilers: Compilers, config: Options, incSetup: IncSetup)
final case class Options(classpath: Seq[File], sources: Seq[File], classesDirectory: File, options: Seq[String], javacOptions: Seq[String], maxErrors: Int, order: CompileOrder.Value)
final case class IncSetup(analysisMap: Map[File, Analysis], definesClass: DefinesClass, skip: Boolean, cacheFile: File)

4
project/Sbt.scala
View File

@ -104,6 +104,8 @@ object Sbt extends Build
// sbt-side interface to compiler. Calls compiler-side interface reflectively
lazy val compilerSub = testedBaseProject(compilePath, "Compile") dependsOn(launchInterfaceSub, interfaceSub % "compile;test->test", ivySub, ioSub, classpathSub,
logSub % "test->test", launchSub % "test->test", apiSub % "test") settings( compilerSettings : _*)
lazy val compilerIntegrationSub = baseProject(compilePath / "integration", "Compiler Integration") dependsOn(
compileIncrementalSub, compilerSub, compilePersistSub, apiSub, classfileSub)
lazy val scriptedBaseSub = baseProject(scriptedPath / "base", "Scripted Framework") dependsOn(ioSub, processSub)
lazy val scriptedSbtSub = baseProject(scriptedPath / "sbt", "Scripted sbt") dependsOn(ioSub, logSub, processSub, scriptedBaseSub, launchInterfaceSub % "provided")
@ -112,7 +114,7 @@ object Sbt extends Build
// Implementation and support code for defining actions.
lazy val actionsSub = baseProject(mainPath / "actions", "Actions") dependsOn(
classfileSub, classpathSub, compileIncrementalSub, compilePersistSub, compilerSub, completeSub, apiSub,
classpathSub, completeSub, apiSub, compilerIntegrationSub,
interfaceSub, ioSub, ivySub, logSub, processSub, runSub, stdTaskSub, taskSub, trackingSub, testingSub)
lazy val commandSub = testedBaseProject(commandPath, "Command") dependsOn(interfaceSub, ioSub, launchInterfaceSub, logSub, completeSub, classpathSub)