From 8986f9755a026691d1839bac806b0b75c2e3e74d Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 26 Jan 2018 17:53:47 -0800 Subject: Fix `dest`-assignment for overriden `T.command`s, and add basic unit tests to validate the `dest` paths of overriden commands and overriden targets --- scalalib/src/mill/scalalib/GenIdea.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scalalib/src') diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala index 927c39d7..45475368 100644 --- a/scalalib/src/mill/scalalib/GenIdea.scala +++ b/scalalib/src/mill/scalalib/GenIdea.scala @@ -1,7 +1,7 @@ package mill.scalalib import ammonite.ops._ -import mill.define.{BaseModule, Segment, Segments, Target} +import mill.define._ import mill.eval.{Evaluator, PathRef} import mill.scalalib import mill.util.Ctx.LogCtx @@ -10,14 +10,16 @@ import mill.util.Strict.Agg object GenIdea { - def apply()(implicit ctx: LogCtx, rootModule0: BaseModule.Implicit): Unit = { + def apply()(implicit ctx: LogCtx, + rootModule0: BaseModule.Implicit, + discover: Discover): Unit = { val rootModule = rootModule0.value val pp = new scala.xml.PrettyPrinter(999, 4) rm! pwd/".idea" rm! pwd/".idea_modules" - val evaluator = new Evaluator(pwd / 'out, pwd, rootModule , ctx.log) + val evaluator = new Evaluator(pwd / 'out, pwd, rootModule, discover, ctx.log) for((relPath, xml) <- xmlFileLayout(evaluator, rootModule)){ write.over(pwd/relPath, pp.format(xml)) -- cgit v1.2.3