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/Lib.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/Lib.scala')
-rw-r--r-- | stage2/Lib.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stage2/Lib.scala b/stage2/Lib.scala index e983a97..46fecf7 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -74,7 +74,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ scalaVersion: String, sourceFiles: Seq[File], dependencyClasspath: ClassPath, - apiTarget: File, + docTarget: File, jarTarget: File, artifactId: String, scalaMajorVersion: String, @@ -86,11 +86,11 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ if(sourceFiles.isEmpty){ None } else { - apiTarget.mkdirs + docTarget.mkdirs val args = Seq( // FIXME: can we use compiler dependency here? "-cp", dependencyClasspath.string, // FIXME: does this break for builds that don't have scalac dependencies? - "-d", apiTarget.toString + "-d", docTarget.toString ) ++ compileArgs ++ sourceFiles.map(_.toString) logger.lib("creating docs for source files "+args.mkString(", ")) redirectOutToErr{ @@ -102,7 +102,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ } lib.jarFile( jarTarget ++ ("/"++artifactId++"_"++scalaMajorVersion++"-"++version++"-javadoc.jar"), - Vector(apiTarget) + Vector(docTarget) ) } } |