Skip to content

Commit 350f915

Browse files
Sync with Scala Native 0.4.4 (#20)
* Sync with SN 0.4.4
1 parent 4e0cc7e commit 350f915

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ val cliAssemblyJarName = settingKey[String]("Name of created assembly jar")
5353
inThisBuild(
5454
Def.settings(
5555
organization := "org.scala-native",
56-
scalaNativeVersion := "0.4.4-SNAPSHOT",
56+
scalaNativeVersion := "0.4.4",
5757
version := scalaNativeVersion.value,
5858
scalaVersion := crossScalaVersions212.last,
5959
crossScalaVersions := latestsScalaVersions,

cli/src/main/scala/scala/scalanative/cli/options/NativeConfigOptions.scala

+8
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ case class NativeConfigOptions(
1616
checkFatalWarnings: Boolean = false,
1717
dump: Boolean = false,
1818
noOptimize: Boolean = false,
19+
embedResources: Boolean = false,
1920
ltp: List[String] = List.empty,
2021
linkingOption: List[String] = List.empty,
2122
compileOption: List[String] = List.empty,
@@ -80,6 +81,13 @@ object NativeConfigOptions {
8081
c.copy(nativeConfig = c.nativeConfig.copy(noOptimize = true))
8182
)
8283
.text("Should the resulting NIR code be not optimized? [false]")
84+
parser
85+
.opt[Unit]("embed-resources")
86+
.optional()
87+
.action((x, c) =>
88+
c.copy(nativeConfig = c.nativeConfig.copy(embedResources = true))
89+
)
90+
.text("Shall resources file be embeded into executable? [false]")
8391
parser
8492
.opt[String]("ltp")
8593
.valueName("<keystring=value>")

cli/src/main/scala/scala/scalanative/cli/utils/ConfigConverter.scala

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ object ConfigConverter {
6161
.withCheckFatalWarnings(options.nativeConfig.checkFatalWarnings)
6262
.withDump(options.nativeConfig.dump)
6363
.withOptimize(!options.nativeConfig.noOptimize)
64+
.withEmbedResources(options.nativeConfig.embedResources)
6465
.withTargetTriple(options.nativeConfig.targetTriple)
6566
.withClang(clang)
6667
.withClangPP(clangPP)

0 commit comments

Comments
 (0)