aboutsummaryrefslogtreecommitdiff
path: root/stage2
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-09-28 10:14:00 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-09-28 10:14:00 -0400
commitd0cbd2c5afe092c85da7099ab052f700cfc24541 (patch)
treeda89d2721eb9400aa43cc6fab39a3c2fc43eaa0f /stage2
parented9fc68716b47de626c3f1f0b5fa1d86a2068498 (diff)
downloadcbt-d0cbd2c5afe092c85da7099ab052f700cfc24541.tar.gz
cbt-d0cbd2c5afe092c85da7099ab052f700cfc24541.tar.bz2
cbt-d0cbd2c5afe092c85da7099ab052f700cfc24541.zip
rename apiTarget to more appropriate name docTarget as the task is
called docJar
Diffstat (limited to 'stage2')
-rw-r--r--stage2/BasicBuild.scala2
-rw-r--r--stage2/Lib.scala8
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)
)
}
}