diff options
Diffstat (limited to 'stage2/BasicBuild.scala')
| -rw-r--r-- | stage2/BasicBuild.scala | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index f102d5c..f3e5f99 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -106,14 +106,11 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge throw new RuntimeException( "no source files found" ) } else sourceFiles - protected def logEmptySourceDirectories(): Unit = { - val nonExisting = - sources - .filterNot( _.exists ) - .diff( Seq(defaultSourceDirectory) ) - if(!nonExisting.isEmpty) logger.stage2("Some sources do not exist: \n"++nonExisting.mkString("\n")) + { + val nonExisting = sources.filterNot( _.exists ).diff( Seq(defaultSourceDirectory) ) + if( nonExisting.nonEmpty ) + logger.stage2("Some sources do not exist: \n"++nonExisting.mkString("\n")) } - logEmptySourceDirectories() def Resolver( urls: URL* ) = MavenResolver( context.cbtLastModified, context.paths.mavenCache, urls: _* ) @@ -129,7 +126,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge def triggerLoopFiles: Seq[File] = sources ++ transitiveDependencies.collect{ case b: TriggerLoop => b.triggerLoopFiles }.flatten - def localJars : Seq[File] = + def localJars: Seq[File] = Seq(projectDirectory ++ "/lib") .filter(_.exists) .flatMap(_.listFiles) @@ -199,14 +196,15 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge } val scalac = new ScalaCompilerDependency(context.cbtLastModified, context.paths.mavenCache, scalaVersion) - runMain( + lib.runMain( "scala.tools.nsc.MainGenericRunner", Seq( "-bootclasspath", scalac.classpath.string, "-classpath", classpath.string - ) ++ context.args : _* + ) ++ context.args , + scalac.classLoader ) } |