Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename millImport variable to metaBuild #3848

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Rename millImport variable to metaBuild #3848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9cb575
Rename `millImport` variable to `metaBuild`
lefou Oct 26, 2024
bee4e36
Merge branch 'main' into rename-millimport-to-metabuild
lefou Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions runner/src/mill/runner/FileImportGraph.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import scala.collection.mutable
* @param ivyDeps
* @param importGraphEdges
* @param errors
* @param millImport If `true`, a meta-build is enabled
* @param metaBuild If `true`, a meta-build is enabled
*/
@internal
case class FileImportGraph(
seenScripts: Map[os.Path, String],
repos: Seq[(String, os.Path)],
ivyDeps: Set[String],
errors: Seq[String],
millImport: Boolean,
metaBuild: Boolean,
buildFile: String
)

Expand Down
2 changes: 1 addition & 1 deletion runner/src/mill/runner/MillBuildBootstrap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class MillBuildBootstrap(
output
)

if (parsedScriptFiles.millImport) evaluateRec(depth + 1)
if (parsedScriptFiles.metaBuild) evaluateRec(depth + 1)
else {
val bootstrapModule =
new MillBuildRootModule.BootstrapModule()(
Expand Down
4 changes: 2 additions & 2 deletions runner/src/mill/runner/MillBuildRootModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,13 @@ abstract class MillBuildRootModule()(implicit

override def sources: T[Seq[PathRef]] = Task {
scriptSources() ++ {
if (parseBuildFiles().millImport) super.sources()
if (parseBuildFiles().metaBuild) super.sources()
else Seq.empty[PathRef]
}
}

override def resources: T[Seq[PathRef]] = Task {
if (parseBuildFiles().millImport) super.resources()
if (parseBuildFiles().metaBuild) super.resources()
else Seq.empty[PathRef]
}

Expand Down
Loading