diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-03 12:17:04 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-03 12:17:04 -0800 |
| commit | 6fa39162250c2477b3c9d322c453dfd51646245b (patch) | |
| tree | 2aeeb882e2a57943e41905df9fa9592385e34d8b | |
| parent | 45fbcbb71b991335d84069b45bbcff3961c1ba15 (diff) | |
| download | mill-6fa39162250c2477b3c9d322c453dfd51646245b.tar.gz mill-6fa39162250c2477b3c9d322c453dfd51646245b.tar.bz2 mill-6fa39162250c2477b3c9d322c453dfd51646245b.zip | |
fix the externalOutPath for RunScript/GenIdea/ReplApplyHandler
| -rw-r--r-- | core/src/mill/main/ReplApplyHandler.scala | 2 | ||||
| -rw-r--r-- | core/src/mill/main/RunScript.scala | 2 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/GenIdea.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/src/mill/main/ReplApplyHandler.scala b/core/src/mill/main/ReplApplyHandler.scala index bea68d94..387951b2 100644 --- a/core/src/mill/main/ReplApplyHandler.scala +++ b/core/src/mill/main/ReplApplyHandler.scala @@ -16,7 +16,7 @@ object ReplApplyHandler{ new ReplApplyHandler( pprinter0, new Evaluator( - ammonite.ops.pwd, + ammonite.ops.pwd / 'out, ammonite.ops.pwd / 'out, rootModule, discover, diff --git a/core/src/mill/main/RunScript.scala b/core/src/mill/main/RunScript.scala index a38baedd..55fd8937 100644 --- a/core/src/mill/main/RunScript.scala +++ b/core/src/mill/main/RunScript.scala @@ -42,7 +42,7 @@ object RunScript{ val eval = for((mapping, discover) <- evaluateMapping(wd, path, interp)) yield new Evaluator[Any]( - wd / 'out, wd, mapping, discover, log, + wd / 'out, wd / 'out, mapping, discover, log, mapping.getClass.getClassLoader.asInstanceOf[SpecialClassLoader].classpathSignature ) diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala index 4bfa6c4c..15057101 100644 --- a/scalalib/src/mill/scalalib/GenIdea.scala +++ b/scalalib/src/mill/scalalib/GenIdea.scala @@ -21,7 +21,7 @@ object GenIdea { rm! pwd/".idea_modules" - val evaluator = new Evaluator(pwd / 'out, pwd, rootModule, discover, ctx.log) + val evaluator = new Evaluator(pwd / 'out, pwd / 'out, rootModule, discover, ctx.log) for((relPath, xml) <- xmlFileLayout(evaluator, rootModule)){ write.over(pwd/relPath, pp.format(xml)) |