Merge pull request #1338 from lwronski/scala-packager-cli_2.13-0.1.28

Scala CLI deb package - Priority and Section flag

Author: romanowski

.github/scripts/generate-os-packages.sh

@@ -45,8 +45,10 @@ generate_deb() {
     --source-app-path "$(launcher)" \
     --output "$ARTIFACTS_DIR/scala-cli.deb" \
     --description "Scala CLI" \
-    --maintainer "Scala CLI" \
-    --launcher-app "scala-cli"
+    --maintainer "[email protected]" \
+    --launcher-app "scala-cli" \
+    --priority "optional" \
+    --section "devel" \
   mv "$ARTIFACTS_DIR/scala-cli.deb" "$ARTIFACTS_DIR/scala-cli-x86_64-pc-linux.deb"
 }
 
@@ -57,7 +59,7 @@ generate_rpm() {
     --source-app-path "$(launcher)" \
     --output "$ARTIFACTS_DIR/scala-cli-x86_64-pc-linux.rpm" \
     --description "Scala CLI" \
-    --maintainer "Scala CLI" \
+    --maintainer "[email protected]" \
     --license "ASL 2.0" \
     --launcher-app "scala-cli"
 }
@@ -84,7 +86,7 @@ generate_msi() {
     --source-app-path "$(launcher)" \
     --output "$ARTIFACTS_DIR/scala-cli-x86_64-pc-win32.msi" \
     --product-name "Scala CLI" \
-    --maintainer "Scala CLI" \
+    --maintainer "[email protected]" \
     --launcher-app "scala-cli" \
     --license-path "./LICENSE" \
     --exit-dialog "To run Scala CLI, open a Command window, and type scala-cli + Enter. If scala-cli cannot be found, ensure that the Command window was opened after Scala CLI was installed." \

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

@@ -32,6 +32,16 @@ final case class PackagerOptions(
     "Architectures that are supported by the repository (default: all)"
   )
     debArchitecture: String = "all",
+  @Group("Debian")
+  @HelpMessage(
+    "This field represents how important it is that the user have the package installed"
+  )
+  priority: Option[String] = None,
+  @Group("Debian")
+  @HelpMessage(
+    "This field specifies an application area into which the package has been classified"
+  )
+  section: Option[String] = None,
   @Group("MacOS")
   @HelpMessage(
   "CF Bundle Identifier"

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

@@ -403,7 +403,9 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
             architecture = packageOptions.debianOptions.architecture.mandatory(
               "--deb-architecture",
               "debian"
-            )
+            ),
+            priority = packageOptions.debianOptions.priority,
+            section = packageOptions.debianOptions.section
           )
 
           lazy val macOSSettings = MacOSSettings(

modules/cli/src/main/scala/scala/cli/commands/util/PackageOptionsUtil.scala

@@ -65,7 +65,9 @@ object PackageOptionsUtil {
             debianOptions = DebianOptions(
               conflicts = packager.debianConflicts,
               dependencies = packager.debianDependencies,
-              architecture = Some(packager.debArchitecture)
+              architecture = Some(packager.debArchitecture),
+              priority = packager.priority,
+              section = packager.section
             ),
             redHatOptions = RedHatOptions(
               license = packager.license,

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

@@ -116,7 +116,9 @@ class NativePackagerTests extends ScalaCliSuite {
 
       testInputs.fromRoot { root =>
 
-        val appName = helloWorldFileName.stripSuffix(".scala").toLowerCase()
+        val appName  = helloWorldFileName.stripSuffix(".scala").toLowerCase()
+        val priority = "optional"
+        val section  = "devel"
 
         val destDir = os.rel / "package"
         os.makeDir.all(root / destDir)
@@ -127,7 +129,9 @@ class NativePackagerTests extends ScalaCliSuite {
           "--output", destDir / s"$appName.deb",
           "--maintainer", "scala-cli-test",
           "--description", "scala-cli-test",
-          "--launcher-app", appName
+          "--launcher-app", appName,
+          "--priority", priority,
+          "--section", section,
         )
         // format: on
         os.proc(cmd).call(
@@ -139,6 +143,11 @@ class NativePackagerTests extends ScalaCliSuite {
         val launcher = root / destDir / s"$appName.deb"
         expect(os.isFile(launcher))
 
+        // check flags
+        val debInfo = os.proc("dpkg", "--info", launcher).call().out.text().trim
+        expect(debInfo.contains(s"Priority: $priority"))
+        expect(debInfo.contains(s"Section: $section"))
+
         if (hasDocker) {
           val script =
             s"""#!/usr/bin/env bash

modules/options/src/main/scala/scala/build/options/packaging/DebianOptions.scala

@@ -5,7 +5,9 @@ import scala.build.options.ConfigMonoid
 final case class DebianOptions(
   conflicts: List[String] = Nil,
   dependencies: List[String] = Nil,
-  architecture: Option[String] = None
+  architecture: Option[String] = None,
+  priority: Option[String] = None,
+  section: Option[String] = None
 )
 
 object DebianOptions {

project/deps.sc

@@ -61,7 +61,7 @@ object Deps {
     def jsoniterScala = "2.17.2"
     def scalaMeta     = "4.5.13"
     def scalaNative   = "0.4.7"
-    def scalaPackager = "0.1.27"
+    def scalaPackager = "0.1.28"
     def signingCli    = "0.1.9"
   }
   // DO NOT hardcode a Scala version in this dependency string

website/docs/reference/cli-options.md

@@ -1087,6 +1087,14 @@ The list of Debian packages that this package depends on
 
 Architectures that are supported by the repository (default: all)
 
+#### `--priority`
+
+This field represents how important it is that the user have the package installed
+
+#### `--section`
+
+This field specifies an application area into which the package has been classified
+
 #### `--identifier`
 
 CF Bundle Identifier