diff options
| -rw-r--r-- | stage2/BasicBuild.scala | 2 | ||||
| -rw-r--r-- | stage2/Lib.scala | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 6d1f010..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" /** 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) ) } } |