diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-28 10:29:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 10:29:30 -0400 |
| commit | 816a2cd3c5e67ceb442d40586566b9f8fd363b79 (patch) | |
| tree | da89d2721eb9400aa43cc6fab39a3c2fc43eaa0f /stage2/BasicBuild.scala | |
| parent | 72bf7175808d40fb962ef1df77e14e777ef54548 (diff) | |
| parent | d0cbd2c5afe092c85da7099ab052f700cfc24541 (diff) | |
| download | cbt-816a2cd3c5e67ceb442d40586566b9f8fd363b79.tar.gz cbt-816a2cd3c5e67ceb442d40586566b9f8fd363b79.tar.bz2 cbt-816a2cd3c5e67ceb442d40586566b9f8fd363b79.zip | |
Merge pull request #240 from cvogt/refactorings
Refactorings
Diffstat (limited to 'stage2/BasicBuild.scala')
| -rw-r--r-- | stage2/BasicBuild.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index b2bb72b..bcc3646 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -57,7 +57,7 @@ trait BaseBuild extends DependencyImplementation with BuildInterface with Trigge /** directory where jars (and the pom file) should be put */ def jarTarget: File = scalaTarget /** directory where the scaladoc should be put */ - def apiTarget: File = scalaTarget ++ "/api" + def docTarget: File = scalaTarget ++ "/api" /** directory where the class files should be put (in package directories) */ def compileTarget: File = scalaTarget ++ "/classes" /** @@ -104,7 +104,8 @@ trait BaseBuild extends DependencyImplementation with BuildInterface with Trigge override def dependencyClasspath : ClassPath = ClassPath(localJars) ++ super.dependencyClasspath protected def compileDependencies: Seq[Dependency] = Nil - final def compileClasspath : ClassPath = ClassPath( compileDependencies.flatMap(_.exportedClasspath.files).distinct ) + final def compileClasspath : ClassPath = + dependencyClasspath ++ ClassPath( compileDependencies.flatMap(_.exportedClasspath.files).distinct ) def exportedClasspath : ClassPath = ClassPath(compile.toSeq) def targetClasspath = ClassPath(Seq(compileTarget)) @@ -129,7 +130,7 @@ trait BaseBuild extends DependencyImplementation with BuildInterface with Trigge lib.compile( context.cbtHasChanged, needsUpdate || context.parentBuild.map(_.needsUpdate).getOrElse(false), - sourceFiles, compileTarget, compileStatusFile, dependencyClasspath ++ compileClasspath, + sourceFiles, compileTarget, compileStatusFile, compileClasspath, context.paths.mavenCache, scalacOptions, context.classLoaderCache, zincVersion = zincVersion, scalaVersion = scalaVersion ) |