diff options
| author | Jiuyang liu <liujiuyang1994@gmail.com> | 2019-10-14 02:33:39 +0000 |
|---|---|---|
| committer | Jiuyang liu <liujiuyang1994@gmail.com> | 2019-10-14 02:42:31 +0000 |
| commit | 8a632462d12000834bea9b0bd4fdb623cf41af38 (patch) | |
| tree | 5ec2a9fab2f3b62946c9004ff6b7a0f251bc6b57 | |
| parent | bf9171d1ba35f03aa86af1a000669695e9821325 (diff) | |
| download | mill-8a632462d12000834bea9b0bd4fdb623cf41af38.tar.gz mill-8a632462d12000834bea9b0bd4fdb623cf41af38.tar.bz2 mill-8a632462d12000834bea9b0bd4fdb623cf41af38.zip | |
get mill classpath and version from system env or java properties.
| -rw-r--r-- | contrib/bsp/src/mill/contrib/BSP.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/bsp/src/mill/contrib/BSP.scala b/contrib/bsp/src/mill/contrib/BSP.scala index d928f4c2..e3166f25 100644 --- a/contrib/bsp/src/mill/contrib/BSP.scala +++ b/contrib/bsp/src/mill/contrib/BSP.scala @@ -69,11 +69,12 @@ object BSP extends ExternalModule { // creates a Json with the BSP connection details def createBspConnectionJson(): String = { - val millPath = scala.sys.props.get("MILL_CLASSPATH").getOrElse(scala.sys.process.Process("which mill").lineStream_!.mkString) + val millPath = scala.sys.props.get("MILL_CLASSPATH").getOrElse(System.getProperty("MILL_CLASSPATH")) + val millVersion = scala.sys.props.get("MILL_VERSION").getOrElse(System.getProperty("MILL_VERSION")) write(BspConfigJson("mill-bsp", List(whichJava, - "-DMILL_CLASSPATH=" + millPath, - s"-DMILL_VERSION=${scala.sys.props("MILL_VERSION")}", + s"-DMILL_CLASSPATH=$millPath", + s"-DMILL_VERSION=$millVersion", "-Djna.nosys=true", "-cp", millPath, |