aboutsummaryrefslogtreecommitdiff
path: root/stage2
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-09-28 20:32:39 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-09-28 20:32:39 -0400
commitcc451640063be53c2fd815ade017d988ab2af564 (patch)
treee84f55d7785486c08395f134425e759652cbf263 /stage2
parent8bd15f12236a6ce3d65952dbcbfc1d25e7a73e32 (diff)
downloadcbt-cc451640063be53c2fd815ade017d988ab2af564.tar.gz
cbt-cc451640063be53c2fd815ade017d988ab2af564.tar.bz2
cbt-cc451640063be53c2fd815ade017d988ab2af564.zip
fix Dottydoc bootclasspath and make output less surprising
Diffstat (limited to 'stage2')
-rw-r--r--stage2/plugins/Dotty.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/stage2/plugins/Dotty.scala b/stage2/plugins/Dotty.scala
index 5700e4d..50255d5 100644
--- a/stage2/plugins/Dotty.scala
+++ b/stage2/plugins/Dotty.scala
@@ -77,11 +77,11 @@ class DottyLib(
val args = Seq(
// FIXME: can we use compiler dependency here?
"-bootclasspath", dottyDependency.classpath.string, // FIXME: does this break for builds that don't have scalac dependencies?
- "-classpath", (dependencyClasspath ++ dottyDependency.classpath).string, // FIXME: does this break for builds that don't have scalac dependencies?
+ "-classpath", dependencyClasspath.string, // FIXME: does this break for builds that don't have scalac dependencies?
"-d", docTarget.toString
) ++ compileArgs ++ sourceFiles.map(_.toString)
logger.lib("creating docs for source files "+args.mkString(", "))
- redirectOutToErr{
+ val exitCode = redirectOutToErr{
runMain(
"dotty.tools.dottydoc.api.java.Dottydoc",
args,
@@ -89,6 +89,8 @@ class DottyLib(
fakeInstance = true // this is a hack as Dottydoc's main method is not static
)
}
+ System.err.println("done")
+ exitCode
}
}