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

Support Scala Native build target #2898

Merged
merged 4 commits into from
Nov 25, 2023
Merged

Support Scala Native build target #2898

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8c9c5e
Support Scala Native build target
lolgab Nov 24, 2023
6293771
Compute file name for libraries
lolgab Nov 24, 2023
b0eb29d
Don't require mainClass for libraries
lolgab Nov 25, 2023
a378bfb
Use precise type in ScalaNativeWorkerImpl
lolgab Nov 25, 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
45 changes: 23 additions & 22 deletions scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,28 +216,29 @@ trait ScalaNativeModule extends ScalaModule { outer =>
private def nativeConfig: Task[NativeConfig] = T.task {
val classpath = runClasspath().map(_.path).filter(_.toIO.exists).toList

NativeConfig(
scalaNativeBridge().config(
finalMainClass(),
classpath.map(_.toIO),
nativeWorkdir().toIO,
nativeClang().toIO,
nativeClangPP().toIO,
nativeTarget(),
nativeCompileOptions(),
nativeLinkingOptions(),
nativeGC(),
nativeLinkStubs(),
nativeLTO().value,
releaseMode().value,
nativeOptimize(),
nativeEmbedResources(),
nativeIncrementalCompilation(),
nativeDump(),
toWorkerApi(logLevel()),
toWorkerApi(nativeBuildTarget())
)
)
scalaNativeBridge().config(
finalMainClassOpt(),
classpath.map(_.toIO),
nativeWorkdir().toIO,
nativeClang().toIO,
nativeClangPP().toIO,
nativeTarget(),
nativeCompileOptions(),
nativeLinkingOptions(),
nativeGC(),
nativeLinkStubs(),
nativeLTO().value,
releaseMode().value,
nativeOptimize(),
nativeEmbedResources(),
nativeIncrementalCompilation(),
nativeDump(),
toWorkerApi(logLevel()),
toWorkerApi(nativeBuildTarget())
) match {
case Right(config) => Result.Success(NativeConfig(config))
case Left(error) => Result.Failure(error)
}
}

private[scalanativelib] def toWorkerApi(logLevel: api.NativeLogLevel): workerApi.NativeLogLevel =
Expand Down
4 changes: 2 additions & 2 deletions scalanativelib/worker-api/src/mill/scalanativelib/worker/api/ScalaNativeWorkerApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ private[scalanativelib] trait ScalaNativeWorkerApi {
def defaultGarbageCollector(): String

def config(
mainClass: String,
mainClass: Either[String, String],
classpath: Seq[File],
nativeWorkdir: File,
nativeClang: File,
Expand All @@ -29,7 +29,7 @@ private[scalanativelib] trait ScalaNativeWorkerApi {
nativeDump: Boolean,
logLevel: NativeLogLevel,
buildTarget: BuildTarget
): Object
): Either[String, Object]

def nativeLink(nativeConfig: Object, outPath: File): File

Expand Down
31 changes: 19 additions & 12 deletions scalanativelib/worker/0.4/src/mill/scalanativelib/worker/ScalaNativeWorkerImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ScalaNativeWorkerImpl extends mill.scalanativelib.worker.api.ScalaNativeWo
def defaultGarbageCollector(): String = GC.default.name

def config(
mainClass: String,
mainClass: Either[String, String],
classpath: Seq[File],
nativeWorkdir: File,
nativeClang: File,
Expand All @@ -65,8 +65,7 @@ class ScalaNativeWorkerImpl extends mill.scalanativelib.worker.api.ScalaNativeWo
nativeDump: Boolean,
logLevel: NativeLogLevel,
buildTarget: BuildTarget
): Object = {
val entry = if (patchIsGreaterThanOrEqual(3)) mainClass else mainClass + "$"
): Either[String, Object] = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be a Either[String, Config]. Refining return types is allowed.

var nativeConfig =
ScalaNativeNativeConfig.empty
.withClang(nativeClang.toPath)
Expand All @@ -89,7 +88,7 @@ class ScalaNativeWorkerImpl extends mill.scalanativelib.worker.api.ScalaNativeWo
nativeConfig = nativeConfig.withBuildTarget(nativeBuildTarget)
} else {
if (buildTarget != BuildTarget.Application) {
err.println("nativeBuildTarget not supported. Please update to Scala Native 0.4.8+")
return Left("nativeBuildTarget not supported. Please update to Scala Native 0.4.8+")
}
}
if (patchIsGreaterThanOrEqual(4)) {
Expand All @@ -98,14 +97,22 @@ class ScalaNativeWorkerImpl extends mill.scalanativelib.worker.api.ScalaNativeWo
if (patchIsGreaterThanOrEqual(9)) {
nativeConfig = nativeConfig.withIncrementalCompilation(nativeIncrementalCompilation)
}
val config =
Config.empty
.withMainClass(entry)
.withClassPath(classpath.map(_.toPath))
.withWorkdir(nativeWorkdir.toPath)
.withCompilerConfig(nativeConfig)
.withLogger(logger(logLevel))
config
var config = Config.empty
.withClassPath(classpath.map(_.toPath))
.withWorkdir(nativeWorkdir.toPath)
.withCompilerConfig(nativeConfig)
.withLogger(logger(logLevel))

if (buildTarget == BuildTarget.Application) {
mainClass match {
case Left(error) => return Left(error)
case Right(mainClass) =>
val entry = if (patchIsGreaterThanOrEqual(3)) mainClass else mainClass + "$"
config = config.withMainClass(entry)
}
}

Right(config)
}

def nativeLink(nativeConfig: Object, outDirectory: File): File = {
Expand Down
Loading