First pass at implicitly propagating a `def basePath: Path` up the `Module` hierarchy, which each module receives and extends.

One constraint is that now must define your abstract modules as `trait`s rather than `class`es, or otherwise add an implicit `ctx: ModuleCtx` parameter to your class definition.

 So far this lets us remove some explicit `basePath` definitions in `build.sc`. Proper handling of `basePath` in `CrossModule`s is future work

1 files changed, 7 insertions, 7 deletions

diff --git a/core/src/main/scala/mill/main/MainRunner.scala b/core/src/main/scala/mill/main/MainRunner.scala
index 76e2d069..322795ea 100644
--- a/core/src/main/scala/mill/main/MainRunner.scala
+++ b/core/src/main/scala/mill/main/MainRunner.scala
@@ -75,15 +75,12 @@ class MainRunner(config: ammonite.main.Cli.Config,
   }
   override def initMain(isRepl: Boolean) = {
     super.initMain(isRepl).copy(
-      scriptCodeWrapper = mill.main.MainRunner.CustomCodeWrapper,
+      scriptCodeWrapper = CustomCodeWrapper,
       // Ammonite does not properly forward the wd from CliConfig to Main, so
       // force forward it outselves
       wd = config.wd
     )
   }
-}
-
-object MainRunner{
   object CustomCodeWrapper extends Preprocessor.CodeWrapper {
     def top(pkgName: Seq[Name], imports: Imports, indexedWrapperName: Name) = {
       val wrapName = indexedWrapperName.backticked
@@ -93,14 +90,17 @@ object MainRunner{
          |$imports
          |import mill._
          |
-         |object $wrapName extends $wrapName{
+         |object $wrapName extends mill.define.Task.BaseModule(ammonite.ops.Path(${pprint.Util.literalize(config.wd.toString)})) with $wrapName{
+         |  // Make sure we don't include the `build` wrapper-object's name in
+         |  // the `basePath`s of our build
+         |  override def basePath = super.basePath / ammonite.ops.up
          |  // Stub to make sure Ammonite has something to call after it evaluates a script,
          |  // even if it does nothing...
          |  def $$main() = Iterator[String]()
          |  lazy val mapping = mill.discover.Discovered.make[$wrapName].mapping(this)
          |}
          |
-         |sealed abstract class $wrapName extends mill.Module{
+         |sealed trait $wrapName extends mill.Module{
          |""".stripMargin
     }
 
@@ -112,4 +112,4 @@ object MainRunner{
       "\n}"
     }
   }
-}
\ No newline at end of file
+}