luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure sbtConfig argv does not need sbt in PATH 

Before, the BSP config .bsp/sbt.json generated by `sbt bspConfig`
contained a command line which required the sbt binary in the PATH.
This fix changes the nature of the -Dsbt.script option. It was
an argument of the main class xsbt.boot.Boot, it's now a system
property and thus it's used to launch the sbt server.

Fixes https://github.com/sbt/sbt/issues/6760
This commit is contained in:
gontard 2021-12-24 16:12:37 +01:00 committed by Eugene Yokota
parent 0f8ac0f543
commit 990fa9530f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protocol/src/main/scala/sbt/internal/bsp/BuildServerConnection.scala
View File

@ -49,9 +49,11 @@ object BuildServerConnection {
"-Xmx100m", "-Xmx100m",
"-classpath", "-classpath",
classPath, classPath,
"xsbt.boot.Boot", ) ++
"-bsp" sbtScript ++
) ++ sbtScript.orElse(sbtLaunchJar) Vector("xsbt.boot.Boot", "-bsp") ++
(if (sbtScript.isEmpty) sbtLaunchJar else None)
val details = BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv) val details = BspConnectionDetails(name, sbtVersion, bspVersion, languages, argv)
val json = Converter.toJson(details).get val json = Converter.toJson(details).get
IO.write(bspConnectionFile, CompactPrinter(json), append = false) IO.write(bspConnectionFile, CompactPrinter(json), append = false)