diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-08-13 20:48:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 20:48:34 +0800 |
| commit | b9b133610f14cc7207e1a3efad43a06a1521b92a (patch) | |
| tree | 30a1ff2843b4b2bb5ec53f13cad869d74612be35 | |
| parent | 916dcc20ee81d40ae264ecf102c47a3e2697a917 (diff) | |
| download | mill-b9b133610f14cc7207e1a3efad43a06a1521b92a.tar.gz mill-b9b133610f14cc7207e1a3efad43a06a1521b92a.tar.bz2 mill-b9b133610f14cc7207e1a3efad43a06a1521b92a.zip | |
Better use of forkWorkingDir
| -rw-r--r-- | scalalib/src/mill/scalalib/JavaModule.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala index 83008d94..259e5cd3 100644 --- a/scalalib/src/mill/scalalib/JavaModule.scala +++ b/scalalib/src/mill/scalalib/JavaModule.scala @@ -275,7 +275,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => forkArgs(), forkEnv(), args, - workingDir = ammonite.ops.pwd + workingDir = forkWorkingDir() )) catch { case e: InteractiveShelloutException => Result.Failure("subprocess failed") } @@ -321,7 +321,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => forkArgs(), forkEnv(), Seq(procId.toString, procTombstone.toString, token, finalMainClass()) ++ args, - workingDir = ammonite.ops.pwd, + workingDir = forkWorkingDir(), background = true )) catch { case e: InteractiveShelloutException => Result.Failure("subprocess failed") @@ -336,7 +336,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => forkArgs(), forkEnv(), Seq(procId.toString, procTombstone.toString, token, mainClass) ++ args, - workingDir = forkWorkingDir, + workingDir = forkWorkingDir(), background = true )) catch { case e: InteractiveShelloutException => Result.Failure("subprocess failed") @@ -358,7 +358,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => forkArgs(), forkEnv(), args, - workingDir = forkWorkingDir + workingDir = forkWorkingDir() )) catch { case e: InteractiveShelloutException => Result.Failure("subprocess failed") } @@ -372,7 +372,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => def intellijModulePath: Path = millSourcePath - def forkWorkingDir = ammonite.ops.pwd + def forkWorkingDir = T{ ammonite.ops.pwd } } trait TestModule extends JavaModule with TaskModule { @@ -395,7 +395,7 @@ trait TestModule extends JavaModule with TaskModule { Seq(args.length.toString) ++ args ++ Seq(outputPath.toString, T.ctx().log.colored.toString, compile().classes.path.toString, T.ctx().home.toString), - workingDir = forkWorkingDir + workingDir = forkWorkingDir() ) try { |