@@ -345,7 +345,7 @@ object Build {
345
345
javacOptions in (Compile , doc) --= Seq (" -Xlint:unchecked" , " -Xlint:deprecation" )
346
346
)
347
347
348
- // Settings shared between dotty-doc and dotty-doc-bootstrapped
348
+ // Settings shared between dotty-doc and dotty-doc-bootstrapped
349
349
lazy val dottyDocSettings = Seq (
350
350
baseDirectory in (Compile , run) := baseDirectory.value / " .." ,
351
351
baseDirectory in Test := baseDirectory.value / " .." ,
@@ -362,11 +362,12 @@ object Build {
362
362
// Make majorVersion available at dotty.epfl.ch/versions/latest-nightly-base
363
363
// Used by sbt-dotty to resolve the latest nightly
364
364
val majorVersion = baseVersion.take(baseVersion.lastIndexOf('.' ))
365
- IO .write(file(" ./docs/_site/versions/latest-nightly-base" ), majorVersion)
365
+ IO .write(file(" ./docs/_site/versions/latest-nightly-base" ), majorVersion)
366
366
367
367
val dottyLib = (packageAll in `dotty-compiler`).value(" dotty-library" )
368
368
val dottyInterfaces = (packageAll in `dotty-compiler`).value(" dotty-interfaces" )
369
- val otherDeps = (dependencyClasspath in Compile ).value.map(_.data).mkString(" :" )
369
+ val otherDeps = (dependencyClasspath in Compile ).value.map(_.data).mkString(File .pathSeparator)
370
+ val docClasspath = dottyLib + File .pathSeparator + dottyInterfaces + File .pathSeparator + otherDeps
370
371
val sources =
371
372
(unmanagedSources in (Compile , compile)).value ++
372
373
(unmanagedSources in (`dotty-compiler`, Compile )).value
@@ -375,7 +376,7 @@ object Build {
375
376
" -project" , " Dotty" ,
376
377
" -project-version" , dottyVersion,
377
378
" -project-url" , dottyGithubUrl,
378
- " -classpath" , s " $dottyLib : $dottyInterfaces : $otherDeps "
379
+ " -classpath" , docClasspath
379
380
)
380
381
(runMain in Compile ).toTask(
381
382
s """ dotty.tools.dottydoc.Main ${args.mkString(" " )} ${sources.mkString(" " )}"""
@@ -386,8 +387,9 @@ object Build {
386
387
val args : Seq [String ] = spaceDelimited(" <arg>" ).parsed
387
388
val dottyLib = (packageAll in `dotty-compiler`).value(" dotty-library" )
388
389
val dottyInterfaces = (packageAll in `dotty-compiler`).value(" dotty-interfaces" )
389
- val otherDeps = (dependencyClasspath in Compile ).value.map(_.data).mkString(" :" )
390
- val cp : Seq [String ] = Seq (" -classpath" , s " $dottyLib: $dottyInterfaces: $otherDeps" )
390
+ val otherDeps = (dependencyClasspath in Compile ).value.map(_.data).mkString(File .pathSeparator)
391
+ val docClasspath = dottyLib + File .pathSeparator + dottyInterfaces + File .pathSeparator + otherDeps
392
+ val cp : Seq [String ] = Seq (" -classpath" , docClasspath)
391
393
(runMain in Compile ).toTask(s """ dotty.tools.dottydoc.Main ${cp.mkString(" " )} """ + args.mkString(" " ))
392
394
}.evaluated,
393
395
0 commit comments