Merge pull request #1167 from wleczny/pass-java-options-into-docker-image

Pass java options to new package

Author: wleczny

modules/cli-options/src/main/scala/scala/cli/commands/PackageOptions.scala

@@ -10,6 +10,8 @@ final case class PackageOptions(
     shared: SharedOptions = SharedOptions(),
   @Recurse
     watch: SharedWatchOptions = SharedWatchOptions(),
+  @Recurse
+    java: SharedJavaOptions = SharedJavaOptions(),
   @Recurse
     compileCross: CompileCrossOptions = CompileCrossOptions(),
   @Recurse

modules/cli/src/main/scala/scala/cli/commands/Package.scala

@@ -54,9 +54,8 @@ object Package extends ScalaCommand[PackageOptions] {
     // FIXME mainClass encoding has issues with special chars, such as '-'
 
     val logger              = options.shared.logger
-    val initialBuildOptions = options.finalBuildOptions.orExit(logger)
+    val initialBuildOptions = buildOptions(options)
     val threads             = BuildThreads.create()
-
     val compilerMaker       = options.compilerMaker(threads)
     val docCompilerMakerOpt = options.docCompilerMakerOpt
 
@@ -137,6 +136,16 @@ object Package extends ScalaCommand[PackageOptions] {
     }
   }
 
+  def buildOptions(options: PackageOptions) = {
+    val finalBuildOptions = options.finalBuildOptions.orExit(options.shared.logger)
+    val buildOptions = finalBuildOptions.copy(javaOptions =
+      finalBuildOptions.javaOptions.copy(javacOptions =
+        finalBuildOptions.javaOptions.javacOptions ++ options.java.allJavaOpts
+      )
+    )
+    buildOptions
+  }
+
   private def doPackage(
     logger: Logger,
     outputOpt: Option[String],
@@ -167,7 +176,7 @@ object Package extends ScalaCommand[PackageOptions] {
           case (_, _) if build.options.notForBloopOptions.packageOptions.isDockerEnabled =>
             for (basePackageType <- basePackageTypeOpt)
               Left(new MalformedCliInputError(
-                s"Unsuported package type: $basePackageType for Docker."
+                s"Unsupported package type: $basePackageType for Docker."
               ))
             Right(PackageType.Docker)
           case (_, Platform.JS) =>
@@ -176,7 +185,7 @@ object Package extends ScalaCommand[PackageOptions] {
                 yield
                   if (validPackageScalaJS.contains(basePackageType)) Right(basePackageType)
                   else Left(new MalformedCliInputError(
-                    s"Unsuported package type: $basePackageType for Scala.js."
+                    s"Unsupported package type: $basePackageType for Scala.js."
                   ))
             validatedPackageType.getOrElse(Right(PackageType.Js))
           case (_, Platform.Native) =>
@@ -185,7 +194,7 @@ object Package extends ScalaCommand[PackageOptions] {
                 yield
                   if (validPackageScalaNative.contains(basePackageType)) Right(basePackageType)
                   else Left(new MalformedCliInputError(
-                    s"Unsuported package type: $basePackageType for Scala Native."
+                    s"Unsupported package type: $basePackageType for Scala Native."
                   ))
             validatedPackageType.getOrElse(Right(PackageType.Native))
           case _ => Right(basePackageTypeOpt.getOrElse(PackageType.Bootstrap))
@@ -653,6 +662,7 @@ object Package extends ScalaCommand[PackageOptions] {
     val preamble = Preamble()
       .withOsKind(Properties.isWin)
       .callsItself(Properties.isWin)
+      .withJavaOpts(build.options.javaOptions.javacOptions)
     val params = Parameters.Bootstrap(Seq(loaderContent), mainClass)
       .withDeterministic(true)
       .withPreamble(preamble)

modules/integration/src/test/scala/scala/cli/integration/PackageTestDefinitions.scala

@@ -767,4 +767,74 @@ abstract class PackageTestDefinitions(val scalaVersionOpt: Option[String])
       expect(mainClasses == Set(scalaFile1, scalaFile2, s"$scriptsDir.${scriptName}_sc"))
     }
   }
+
+  test("pass java options") {
+    val fileName           = "Hello.scala"
+    val destFile           = if (Properties.isWin) "hello.bat" else "hello"
+    val (fooProp, barProp) = ("abc", "xyz")
+    val inputs = TestInputs(
+      Seq(
+        os.rel / fileName ->
+          s"""object Hello {
+             |  def main(args: Array[String]): Unit =
+             |    println(s"$${sys.props("foo")}$${sys.props("bar")}")
+             |}
+             |""".stripMargin
+      )
+    )
+    inputs.fromRoot { root =>
+      os.proc(
+        TestUtil.cli,
+        "package",
+        fileName,
+        "-o",
+        destFile,
+        "--java-prop",
+        s"foo=$fooProp",
+        "--java-opt",
+        s"-Dbar=$barProp",
+        "-f"
+      ).call(cwd = root)
+      val output = os.proc(root / destFile).call(cwd = root).out.text().trim
+      expect(output == s"$fooProp$barProp")
+    }
+  }
+
+  def javaOptionsDockerTest(): Unit = {
+    val fileName           = "Hello.scala"
+    val imageName          = "hello"
+    val (fooProp, barProp) = ("abc", "xyz")
+    val inputs = TestInputs(
+      Seq(
+        os.rel / fileName ->
+          s"""object Hello {
+             |  def main(args: Array[String]): Unit =
+             |    println(s"$${sys.props("foo")}$${sys.props("bar")}")
+             |}
+             |""".stripMargin
+      )
+    )
+    inputs.fromRoot { root =>
+      os.proc(
+        TestUtil.cli,
+        "package",
+        fileName,
+        "--docker",
+        "--docker-image-repository",
+        imageName,
+        "--java-prop",
+        s"foo=$fooProp",
+        "--java-opt",
+        s"-Dbar=$barProp",
+        "-f"
+      ).call(cwd = root)
+      val output = os.proc("docker", "run", imageName).call(cwd = root).out.text().trim
+      expect(output == s"$fooProp$barProp")
+    }
+  }
+
+  if (Properties.isLinux)
+    test("pass java options to docker") {
+      javaOptionsDockerTest()
+    }
 }

website/docs/reference/cli-options.md

@@ -645,6 +645,7 @@ Binary directory
 ## Java options
 
 Available in commands:
+- [`package`](./commands.md#package)
 - [`console` / `repl`](./commands.md#console)
 - [`run`](./commands.md#run)
 - [`shebang`](./commands.md#shebang)

website/docs/reference/commands.md

@@ -176,6 +176,7 @@ Accepts options:
 - [dependency](./cli-options.md#dependency-options)
 - [directories](./cli-options.md#directories-options)
 - [help group](./cli-options.md#help-group-options)
+- [java](./cli-options.md#java-options)
 - [jvm](./cli-options.md#jvm-options)
 - [logging](./cli-options.md#logging-options)
 - [main class](./cli-options.md#main-class-options)