8333727: Use JOpt in jpackage to parse command line

src/jdk.internal.opt/share/classes/module-info.java

@@ -32,6 +32,7 @@
     exports jdk.internal.joptsimple to
         jdk.jlink,
         jdk.jshell,
+        jdk.jpackage,
         jdk.jdeps;
     exports jdk.internal.opt to
         jdk.compiler,

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java

@@ -26,12 +26,10 @@
 
 import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
 import static jdk.jpackage.internal.model.LauncherShortcut.toRequest;
-import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -82,22 +80,12 @@ private DesktopIntegration(BuildEnv env, LinuxPackage pkg, LinuxLauncher launche
         //  - user explicitly requested to create a shortcut
         boolean withDesktopFile = !associations.isEmpty() || toRequest(launcher.shortcut()).orElse(false);
 
-        var curIconResource = createLauncherIconResource(pkg.app(), launcher,
-                env::createResource);
-
-        if (curIconResource.isEmpty()) {
+        if (!launcher.hasIcon()) {
             // This is additional launcher with explicit `no icon` configuration.
             withDesktopFile = false;
-        } else {
-            try {
-                if (curIconResource.get().saveToFile((Path)null) != OverridableResource.Source.DefaultResource) {
-                    // This launcher has custom icon configured.
-                    withDesktopFile = true;
-                }
-            } catch (IOException ex) {
-                // Should never happen as `saveToFile((Path)null)` should not perform any actual I/O operations.
-                throw new UncheckedIOException(ex);
-            }
+        } else if (launcher.hasCustomIcon()) {
+            // This launcher has custom icon configured.
+            withDesktopFile = true;
         }
 
         desktopFileResource = env.createResource("template.desktop")
@@ -119,17 +107,12 @@ private DesktopIntegration(BuildEnv env, LinuxPackage pkg, LinuxLauncher launche
         if (withDesktopFile) {
             desktopFile = Optional.of(createDesktopFile(desktopFileName));
             iconFile = Optional.of(createDesktopFile(escapedAppFileName + ".png"));
-
-            if (curIconResource.isEmpty()) {
-                // Create default icon.
-                curIconResource = createLauncherIconResource(pkg.app(), pkg.app().mainLauncher().orElseThrow(), env::createResource);
-            }
         } else {
             desktopFile = Optional.empty();
             iconFile = Optional.empty();
         }
 
-        iconResource = curIconResource;
+        iconResource = createLauncherIconResource(launcher, env::createResource);
 
         desktopFileData = createDataForDesktopFile();
 

src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxBundlingEnvironment.java

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal;
+
+import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.internal.LinuxFromOptions.createLinuxApplication;
+import static jdk.jpackage.internal.LinuxPackagingPipeline.APPLICATION_LAYOUT;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_LINUX_APP_IMAGE;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_LINUX_DEB;
+import static jdk.jpackage.internal.cli.StandardBundlingOperation.CREATE_LINUX_RPM;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+import jdk.jpackage.internal.cli.Options;
+import jdk.jpackage.internal.cli.StandardBundlingOperation;
+import jdk.jpackage.internal.model.BundlingOperationDescriptor;
+import jdk.jpackage.internal.model.LinuxPackage;
+import jdk.jpackage.internal.model.PackageType;
+import jdk.jpackage.internal.util.Result;
+
+public class LinuxBundlingEnvironment extends DefaultBundlingEnvironment {
+
+    public LinuxBundlingEnvironment() {
+        super(build()
+                .defaultOperation(() -> {
+                    return LazyLoad.SYS_ENV.value().map(LinuxSystemEnvironment::nativePackageType).map(DESCRIPTORS::get);
+                })
+                .bundler(CREATE_LINUX_APP_IMAGE, LinuxBundlingEnvironment::createAppImage)
+                .bundler(CREATE_LINUX_DEB, LazyLoad::debSysEnv, LinuxBundlingEnvironment::createDebPackage)
+                .bundler(CREATE_LINUX_RPM, LazyLoad::rpmSysEnv, LinuxBundlingEnvironment::createRpmPackage));
+    }
+
+    private static void createDebPackage(Options options, LinuxDebSystemEnvironment sysEnv) {
+
+        createNativePackage(options,
+                LinuxFromOptions::createLinuxDebPackage,
+                buildEnv()::create,
+                LinuxBundlingEnvironment::buildPipeline,
+                (env, pkg, outputDir) -> {
+                    return new LinuxDebPackager(env, pkg, outputDir, sysEnv);
+                });
+    }
+
+    private static void createRpmPackage(Options options, LinuxRpmSystemEnvironment sysEnv) {
+
+        createNativePackage(options,
+                LinuxFromOptions::createLinuxRpmPackage,
+                buildEnv()::create,
+                LinuxBundlingEnvironment::buildPipeline,
+                (env, pkg, outputDir) -> {
+                    return new LinuxRpmPackager(env, pkg, outputDir, sysEnv);
+                });
+    }
+
+    private static void createAppImage(Options options) {
+
+        final var app = createLinuxApplication(options);
+
+        createApplicationImage(options, app, LinuxPackagingPipeline.build());
+    }
+
+    private static PackagingPipeline.Builder buildPipeline(LinuxPackage pkg) {
+        return LinuxPackagingPipeline.build();
+    }
+
+    private static BuildEnvFromOptions buildEnv() {
+        return new BuildEnvFromOptions().predefinedAppImageLayout(APPLICATION_LAYOUT);
+    }
+
+    private static final class LazyLoad {
+
+        static Result<LinuxDebSystemEnvironment> debSysEnv() {
+            return DEB_SYS_ENV;
+        }
+
+        static Result<LinuxRpmSystemEnvironment> rpmSysEnv() {
+            return RPM_SYS_ENV;
+        }
+
+        private static final Result<LinuxSystemEnvironment> SYS_ENV = LinuxSystemEnvironment.create();
+
+        private static final Result<LinuxDebSystemEnvironment> DEB_SYS_ENV = LinuxDebSystemEnvironment.create(SYS_ENV);
+
+        private static final Result<LinuxRpmSystemEnvironment> RPM_SYS_ENV = LinuxRpmSystemEnvironment.create(SYS_ENV);
+    }
+
+    private static final Map<PackageType, BundlingOperationDescriptor> DESCRIPTORS = Stream.of(
+            CREATE_LINUX_DEB,
+            CREATE_LINUX_RPM
+    ).collect(toMap(StandardBundlingOperation::packageType, StandardBundlingOperation::descriptor));
+}