.

Author: lihaoyi

core/api/src/mill/api/internal/RootModule.scala

@@ -39,6 +39,8 @@ object RootModule {
       val topLevelProjectRoot: os.Path,
       val buildOverrides: Map[String, ujson.Value]
   ) {
+    mill.constants.DebugLog.println("buildOverrides " + buildOverrides)
+    mill.constants.DebugLog.println("projectRoot " + projectRoot)
     def this(
               projectRoot: os.Path,
               output: os.Path,
@@ -48,12 +50,12 @@ object RootModule {
         projectRoot0: String,
         output0: String,
         topLevelProjectRoot0: String,
-        @com.lihaoyi.unroll buildOverrides: ujson.Value = Map()
+        headerData: String
     ) = this(
       os.Path(projectRoot0),
       os.Path(output0),
       os.Path(topLevelProjectRoot0),
-      upickle.read[Map[String, ujson.Value]](buildOverrides)
+      upickle.read[Map[String, ujson.Value]](headerData)
     )
     implicit val millMiscInfo: Info = this
   }

core/exec/src/mill/exec/GroupExecution.scala

@@ -104,6 +104,7 @@ trait GroupExecution {
         labelled.ctx.segments.last.value match {
           case single if labelled.ctx.enclosingModule.buildOverrides.contains(single) =>
             val jsonData = labelled.ctx.enclosingModule.buildOverrides(single)
+
             import collection.JavaConverters._
             def rec(x: ujson.Value): ujson.Value = x match{
               case ujson.Str(s) => mill.constants.Util.interpolateEnvVars(s, envWithPwd.asJava)

runner/daemon/src/mill/daemon/MillBuildBootstrap.scala

@@ -98,13 +98,13 @@ class MillBuildBootstrap(
         os.exists(currentRoot / rootBuildFileName)
       )
 
-      val (nestedState, headerDataOpt) =
+      val nestedState =
         if (depth == 0) {
           // On this level we typically want to assume a Mill project, which means we want to require an existing `build.mill`.
           // Unfortunately, some tasks also make sense without a `build.mill`, e.g. the `init` command.
           // Hence, we only report a missing `build.mill` as a problem if the command itself does not succeed.
           lazy val state = evaluateRec(depth + 1)
-          if (currentRootContainsBuildFile) (state, None)
+          if (currentRootContainsBuildFile) state
           else {
             val msg =
               s"No build file (${rootBuildFileNames.asScala.mkString(", ")}) found in $projectRoot. Are you in a Mill project directory?"
@@ -118,7 +118,7 @@ class MillBuildBootstrap(
                   case state => state
                 }
               }
-            (res, None)
+            res
           }
         } else {
           val parsedScriptFiles = FileImportGraph
@@ -134,12 +134,17 @@ class MillBuildBootstrap(
             else {
               val bootstrapModule =
                 new MillBuildRootModule.BootstrapModule()(
-                  using new RootModule.Info(currentRoot, output, projectRoot)
+                  using new RootModule.Info(
+                    currentRoot,
+                    output,
+                    projectRoot,
+                    upickle.read[Map[String, ujson.Value]](mill.internal.Util.parseHeaderData(parsedScriptFiles.headerData))
+                  )
                 )
               RunnerState(Some(bootstrapModule), Nil, None, Some(parsedScriptFiles.buildFile))
             }
 
-          (state, Some(parsedScriptFiles.headerData))
+          state
         }
 
       val classloaderChanged =

runner/meta/src/mill/meta/CodeGen.scala

@@ -21,7 +21,8 @@ object CodeGen {
       supportDest: os.Path,
       millTopLevelProjectRoot: os.Path,
       output: os.Path,
-      parser: MillScalaParser
+      parser: MillScalaParser,
+      headerData: String
   ): Unit = {
     val scriptSources = allScriptCode.keys.toSeq.sorted
     for (scriptPath <- scriptSources) breakable {
@@ -104,7 +105,8 @@ object CodeGen {
           scriptFolderPath = scriptFolderPath,
           segments = segments,
           millTopLevelProjectRoot = millTopLevelProjectRoot,
-          output = output
+          output = output,
+          headerData = headerData
         )
 
         os.write(supportDestDir / "MillMiscInfo.scala", miscInfo, createFolders = true)
@@ -160,15 +162,17 @@ object CodeGen {
       scriptFolderPath: os.Path,
       segments: Seq[String],
       millTopLevelProjectRoot: os.Path,
-      output: os.Path
+      output: os.Path,
+      headerData: String
   ): String = {
     val header = if (pkg.isBlank()) "" else s"package $pkg"
     val body =
       if (segments.nonEmpty) subfolderMiscInfo(scriptFolderPath, segments)
       else rootMiscInfo(
         scriptFolderPath,
         millTopLevelProjectRoot,
-        output
+        output,
+        headerData
       )
 
     s"""|$generatedFileHeader
@@ -321,14 +325,17 @@ object CodeGen {
   def rootMiscInfo(
       scriptFolderPath: os.Path,
       millTopLevelProjectRoot: os.Path,
-      output: os.Path
+      output: os.Path,
+      headerData: String
   ): String = {
+    val headerJson = ujson.Obj.from(mill.internal.Util.parseHeaderData(headerData)).render()
     s"""|@_root_.scala.annotation.nowarn
         |object MillMiscInfo 
         |    extends mill.api.internal.RootModule.Info(
         |  projectRoot0 = ${literalize(scriptFolderPath.toString)},
         |  output0 = ${literalize(output.toString)},
-        |  topLevelProjectRoot0 = ${literalize(millTopLevelProjectRoot.toString)}
+        |  topLevelProjectRoot0 = ${literalize(millTopLevelProjectRoot.toString)},
+        |  headerData = ${literalize(headerJson)}
         |)
         |""".stripMargin
   }

runner/meta/src/mill/meta/MillBuildRootModule.scala

@@ -119,7 +119,8 @@ trait MillBuildRootModule()(implicit
         support,
         rootModuleInfo.topLevelProjectRoot,
         rootModuleInfo.output,
-        MillScalaParser.current.value
+        MillScalaParser.current.value,
+        parsed.headerData
       )
       (wrapped = Seq(PathRef(wrapped)), support = Seq(PathRef(support)))
     }