diff options
| author | Samvel Abrahamyan <samvel1024@gmail.com> | 2019-10-14 15:49:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 15:49:05 +0200 |
| commit | 90d12656a6680c54d273683e3c08cedc9f61027f (patch) | |
| tree | 5ec2a9fab2f3b62946c9004ff6b7a0f251bc6b57 | |
| parent | 5f6da18596a0544c0270af8cf11478024220eab2 (diff) | |
| parent | 8a632462d12000834bea9b0bd4fdb623cf41af38 (diff) | |
| download | mill-90d12656a6680c54d273683e3c08cedc9f61027f.tar.gz mill-90d12656a6680c54d273683e3c08cedc9f61027f.tar.bz2 mill-90d12656a6680c54d273683e3c08cedc9f61027f.zip | |
Merge pull request #4 from sequencer/bsp_patch
bug fix for system vended mill, no `MILL_CLASSPATH` avalible.
| -rw-r--r-- | contrib/bsp/src/mill/contrib/BSP.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/bsp/src/mill/contrib/BSP.scala b/contrib/bsp/src/mill/contrib/BSP.scala index 5334f509..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("MILL_CLASSPATH") + 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, @@ -133,4 +134,4 @@ object BSP extends ExternalModule { executor.shutdown() } } -}
\ No newline at end of file +} |