diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-02 20:45:41 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-02 20:51:04 -0800 |
| commit | 27273750636acbbff1b37cf53bba76684f0b96bb (patch) | |
| tree | af71defa4ea57b2ef70998c1546aa34321f38013 /core/src | |
| parent | 2e50c963eecadcf7bd6ecd6956584ab099d5273a (diff) | |
| download | mill-27273750636acbbff1b37cf53bba76684f0b96bb.tar.gz mill-27273750636acbbff1b37cf53bba76684f0b96bb.tar.bz2 mill-27273750636acbbff1b37cf53bba76684f0b96bb.zip | |
consolidate test initialization logic into TestEvaluator
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/mill/eval/Evaluator.scala | 1 | ||||
| -rw-r--r-- | core/src/mill/main/ReplApplyHandler.scala | 3 | ||||
| -rw-r--r-- | core/src/mill/main/RunScript.scala | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/core/src/mill/eval/Evaluator.scala b/core/src/mill/eval/Evaluator.scala index d248ce73..31b59865 100644 --- a/core/src/mill/eval/Evaluator.scala +++ b/core/src/mill/eval/Evaluator.scala @@ -26,6 +26,7 @@ case class Labelled[T](target: NamedTask[T], } class Evaluator[T](val workspacePath: Path, val basePath: Path, + val externalBasePath: Path, val rootModule: mill.Module, val discover: Discover[T], log: Logger, diff --git a/core/src/mill/main/ReplApplyHandler.scala b/core/src/mill/main/ReplApplyHandler.scala index 40363be1..67ff8498 100644 --- a/core/src/mill/main/ReplApplyHandler.scala +++ b/core/src/mill/main/ReplApplyHandler.scala @@ -16,8 +16,9 @@ object ReplApplyHandler{ new ReplApplyHandler( pprinter0, new mill.eval.Evaluator( - ammonite.ops.pwd / 'out, ammonite.ops.pwd, + ammonite.ops.pwd / 'out, + ammonite.ops.pwd / 'out, rootModule, discover, new mill.util.PrintLogger( diff --git a/core/src/mill/main/RunScript.scala b/core/src/mill/main/RunScript.scala index ce4e6835..f09acf66 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, wd, mapping, discover, log, mapping.getClass.getClassLoader.asInstanceOf[SpecialClassLoader].classpathSignature ) |