8333664: Decouple command line parsing and package building in jpackage

Reviewed-by: almatvee

Author: Alexey Semenyuk

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -27,6 +27,13 @@
 
 public class LinuxAppBundler extends AppImageBundler {
     public LinuxAppBundler() {
-        setAppImageSupplier(LinuxAppImageBuilder::new);
+        setAppImageSupplier((params, output) -> {
+            // Order is important!
+            var app = LinuxFromParams.APPLICATION.fetchFrom(params);
+            var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
+            LinuxPackagingPipeline.build()
+                    .excludeDirFromCopying(output.getParent())
+                    .create().execute(BuildEnv.withAppImageDir(env, output), app);
+        });
     }
 }

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

@@ -0,0 +1,46 @@
+/*
+ * 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 jdk.jpackage.internal.util.PathUtils.resolveNullablePath;
+
+import java.nio.file.Path;
+import jdk.jpackage.internal.model.ApplicationLayout;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+interface LinuxApplicationLayout extends ApplicationLayout, LinuxApplicationLayoutMixin {
+
+    static LinuxApplicationLayout create(ApplicationLayout layout, Path libAppLauncher) {
+        return CompositeProxy.build()
+                .invokeTunnel(CompositeProxyTunnel.INSTANCE)
+                .create(LinuxApplicationLayout.class, layout, new LinuxApplicationLayoutMixin.Stub(libAppLauncher));
+    }
+
+    @Override
+    default LinuxApplicationLayout resolveAt(Path root) {
+        return create(ApplicationLayout.super.resolveAt(root),
+                resolveNullablePath(root, libAppLauncher()));
+    }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,30 +26,13 @@
 
 import java.nio.file.Path;
 
-/**
- *
- * Platform package of an application.
- */
-interface PlatformPackage {
-
-    /**
-     * Platform-specific package name.
-     */
-    String name();
+// Must be publc to allow access from AppImageLayout.toPathGroup()
+public interface LinuxApplicationLayoutMixin {
 
     /**
-     * Root directory where sources for packaging tool should be stored. On Unix
-     * systems contents of this directory will be installed in "/" directory.
+     * Path to "libapplauncher.so".
      */
-    Path sourceRoot();
+    Path libAppLauncher();
 
-    /**
-     * Source application layout from which to build the package.
-     */
-    ApplicationLayout sourceApplicationLayout();
-
-    /**
-     * Application layout of the installed package.
-     */
-    ApplicationLayout installedApplicationLayout();
+    record Stub(Path libAppLauncher) implements LinuxApplicationLayoutMixin {}
 }