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

Jump to bottom

Fix BuildInfo in 3.6.x #3371

Merged
merged 2 commits into from
Jun 21, 2023
Merged

Fix BuildInfo in 3.6.x #3371

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2124eb
Fix buildinfo compile in mill
sequencer Jun 20, 2023
391b6f6
Update build.sc
sequencer Jun 20, 2023
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
40 changes: 24 additions & 16 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import mill.scalalib._
import mill.scalalib.publish._
import mill.scalalib.scalafmt._
import coursier.maven.MavenRepository
import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION`
import mill.contrib.buildinfo.BuildInfo

object chisel3 extends mill.Cross[chisel3CrossModule]("2.13.10", "2.12.17")

Expand Down Expand Up @@ -89,7 +87,7 @@ trait CommonModule extends CrossSbtModule with PublishModule with ScalafmtModule
)
}

class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule with BuildInfo {
class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule {
m =>

/** Default behavior assumes `build.sc` in the upper path of `src`.
Expand Down Expand Up @@ -145,16 +143,6 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit
override def moduleDeps = super.moduleDeps ++ Seq(stdlib) ++ chiseltestModule
}

override def buildInfoPackageName = Some("chisel3")

override def buildInfoMembers = T {
Map(
"buildInfoPackage" -> artifactName(),
"version" -> publishVersion(),
"scalaVersion" -> scalaVersion()
)
}

object macros extends CommonModule {

/** millOuterCtx.segment.pathSegments didn't detect error here. */
Expand Down Expand Up @@ -187,10 +175,30 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit
"-Xlint:infer-any"
)
}
private def generateBuildInfo = T {
val outputFile = T.dest / "BuildInfo.scala"
val contents =
s"""
|package chisel3
|case object BuildInfo {
| val buildInfoPackage: String = "chisel3"
| val version: String = "1.6.X"
sequencer marked this conversation as resolved.
Show resolved Hide resolved
| val scalaVersion: String = "${scalaVersion()}"
| val firtoolVersion: scala.Option[String] = None
| override val toString: String = {
| "buildInfoPackage: %s, version: %s, scalaVersion: %s, firtoolVersion %s".format(
| buildInfoPackage, version, scalaVersion, firtoolVersion
| )
| }
|}
|""".stripMargin
os.write(outputFile, contents, createFolders = true)
PathRef(T.dest)
}

override def generatedSources = T {
Seq(generatedBuildInfo()._2)
}
override def generatedSources = T {
super.generatedSources() :+ generateBuildInfo()
}
}

object plugin extends CommonModule {
Expand Down