Got rid of params in DMG bundler. Enhanced PackagingPipeline to do native packaging. Changed Linux, Windows, and DMG bunders to work inside of the pipeline. All tests but PKG packaging pass. PKG bundler compiles but has not been tested.

Author: alexeysemenyukoracle

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

@@ -34,6 +34,8 @@
 import java.util.Objects;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.PackagingPipeline.PackageBuildEnv;
+import jdk.jpackage.internal.model.AppImageLayout;
 import jdk.jpackage.internal.model.ConfigException;
 import jdk.jpackage.internal.model.LinuxPackage;
 import jdk.jpackage.internal.model.Package;
@@ -103,48 +105,41 @@ public final Path execute(Map<String, ? super Object> params,
         final LinuxPackage pkg = pkgParam.fetchFrom(params);
         final var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
 
-        final BuildEnv pkgEnv;
-
-        if (pkg.app().runtimeBuilder().isEmpty()) {
-            // Packaging external app image
-            pkgEnv = BuildEnv.withAppImageDir(env, BuildEnvBuilder.defaultAppImageDir(env.buildRoot()));
-        } else {
-            pkgEnv = env;
-        }
-
         LinuxPackagingPipeline.build()
                 .excludeDirFromCopying(outputParentDir)
-                .pkgBuildEnvFactory((e, p) -> pkgEnv)
+                .task(PackagingPipeline.PackageTaskID.CREATE_PACKAGE_FILE)
+                        .packageAction(this::buildPackage)
+                        .add()
+                .task(PackagingPipeline.PackageTaskID.RUN_POST_IMAGE_USER_SCRIPT)
+                        .noaction() // FIXME: implement post-app-image script execution on Linux
+                        .add()
                 .create().execute(env, pkg, outputParentDir);
 
-        try {
-            for (var ca : customActions) {
-                ca.init(pkgEnv, pkg);
-            }
+        return outputParentDir.resolve(pkg.packageFileNameWithSuffix()).toAbsolutePath();
+    }
 
-            Map<String, String> data = createDefaultReplacementData(pkgEnv, pkg);
+    private void buildPackage(PackageBuildEnv<LinuxPackage, AppImageLayout> env) throws PackagerException, IOException {
+        for (var ca : customActions) {
+            ca.init(env.env(), env.pkg());
+        }
 
-            for (var ca : customActions) {
-                ShellCustomAction.mergeReplacementData(data, ca.instance.create());
-            }
+        Map<String, String> data = createDefaultReplacementData(env.env(), env.pkg());
 
-            data.putAll(createReplacementData(pkgEnv, pkg));
+        for (var ca : customActions) {
+            ShellCustomAction.mergeReplacementData(data, ca.instance.create());
+        }
 
-            Path packageBundle = buildPackageBundle(Collections.unmodifiableMap(
-                    data), pkgEnv, pkg, outputParentDir);
+        data.putAll(createReplacementData(env.env(), env.pkg()));
 
-            verifyOutputBundle(pkgEnv, pkg, packageBundle).stream()
-                    .filter(Objects::nonNull)
-                    .forEachOrdered(ex -> {
-                Log.verbose(ex.getLocalizedMessage());
-                Log.verbose(ex.getAdvice());
-            });
+        Path packageBundle = buildPackageBundle(Collections.unmodifiableMap(
+                data), env.env(), env.pkg(), env.outputDir());
 
-            return packageBundle;
-        } catch (IOException ex) {
-            Log.verbose(ex);
-            throw new PackagerException(ex);
-        }
+        verifyOutputBundle(env.env(), env.pkg(), packageBundle).stream()
+                .filter(Objects::nonNull)
+                .forEachOrdered(ex -> {
+            Log.verbose(ex.getLocalizedMessage());
+            Log.verbose(ex.getAdvice());
+        });
     }
 
     private List<String> getListOfNeededPackages(BuildEnv env) throws IOException {

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

@@ -25,12 +25,13 @@
 package jdk.jpackage.internal;
 
 import static jdk.jpackage.internal.ApplicationImageUtils.createLauncherIconResource;
+import jdk.jpackage.internal.PackagingPipeline.AppImageBuildEnv;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import jdk.jpackage.internal.PackagingPipeline.AppImageTaskID;
+import jdk.jpackage.internal.PackagingPipeline.BuildApplicationTaskID;
 import jdk.jpackage.internal.PackagingPipeline.PrimaryTaskID;
 import jdk.jpackage.internal.PackagingPipeline.TaskID;
 import jdk.jpackage.internal.model.Application;
@@ -48,27 +49,29 @@ static PackagingPipeline.Builder build() {
         return PackagingPipeline.buildStandard()
                 .task(LinuxAppImageTaskID.LAUNCHER_LIB)
                         .addDependent(PrimaryTaskID.BUILD_APPLICATION_IMAGE)
-                        .action(LinuxPackagingPipeline::writeLauncherLib).add()
+                        .applicationAction(LinuxPackagingPipeline::writeLauncherLib).add()
                 .task(LinuxAppImageTaskID.LAUNCHER_ICONS)
-                        .addDependent(AppImageTaskID.CONTENT)
-                        .action(LinuxPackagingPipeline::writeLauncherIcons).add();
+                        .addDependent(BuildApplicationTaskID.CONTENT)
+                        .applicationAction(LinuxPackagingPipeline::writeLauncherIcons).add();
     }
 
-    private static void writeLauncherLib(BuildEnv env, Application app,
-            ApplicationLayout appLayout) throws IOException {
-        var launcherLib = ((LinuxApplicationLayout)appLayout).libAppLauncher();
+    private static void writeLauncherLib(
+            AppImageBuildEnv<Application, LinuxApplicationLayout> env) throws IOException {
+
+        final var launcherLib = env.resolvedLayout().libAppLauncher();
         try (var in = ResourceLocator.class.getResourceAsStream("libjpackageapplauncheraux.so")) {
             Files.createDirectories(launcherLib.getParent());
             Files.copy(in, launcherLib);
         }
     }
 
-    private static void writeLauncherIcons(BuildEnv env, Application app,
-            ApplicationLayout appLayout) throws IOException {
-        for (var launcher : app.launchers()) {
-            createLauncherIconResource(app, launcher, env::createResource).ifPresent(iconResource -> {
+    private static void writeLauncherIcons(
+            AppImageBuildEnv<Application, ApplicationLayout> env) throws IOException {
+
+        for (var launcher : env.app().launchers()) {
+            createLauncherIconResource(env.app(), launcher, env.env()::createResource).ifPresent(iconResource -> {
                 String iconFileName = launcher.executableName() + ".png";
-                Path iconTarget = appLayout.destktopIntegrationDirectory().resolve(iconFileName);
+                Path iconTarget = env.resolvedLayout().destktopIntegrationDirectory().resolve(iconFileName);
                 try {
                     iconResource.saveToFile(iconTarget);
                 } catch (IOException ex) {

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppBundler.java

@@ -46,20 +46,9 @@ public MacAppBundler() {
              final var app = MacFromParams.APPLICATION.fetchFrom(params);
              final var env = BuildEnv.withAppImageDir(BuildEnvFromParams.BUILD_ENV.fetchFrom(params), output);
 
-             final var taskPipelineBuilder = MacPackagingPipeline.build()
+             MacPackagingPipeline.build(Optional.empty())
                      .excludeDirFromCopying(output.getParent())
-                     .excludeDirFromCopying(OUTPUT_DIR.fetchFrom(params))
-                     .inputApplicationLayoutForPackaging(pkg -> pkg.app().asApplicationLayout());
-
-             final var pkg = FromParams.getCurrentPackage(params);
-             if (pkg.isPresent()) {
-                 taskPipelineBuilder.pkgBuildEnvFactory((e, p) -> {
-                     return BuildEnv.withAppImageDir(e, output);
-                 });
-                 taskPipelineBuilder.create().execute(env, pkg.orElseThrow(), output);
-             } else {
-                 taskPipelineBuilder.create().execute(env, app);
-             }
+                     .excludeDirFromCopying(OUTPUT_DIR.fetchFrom(params)).create().execute(env, app);
 
          });
          setParamsValidator(MacAppBundler::doValidate);

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java

@@ -26,17 +26,16 @@
 package jdk.jpackage.internal;
 
 import jdk.jpackage.internal.model.ConfigException;
-import jdk.jpackage.internal.model.PackagerException;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.Map;
 import java.util.Optional;
 import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
 import static jdk.jpackage.internal.StandardBundlerParam.INSTALLER_NAME;
 import static jdk.jpackage.internal.StandardBundlerParam.INSTALL_DIR;
+import static jdk.jpackage.internal.StandardBundlerParam.OUTPUT_DIR;
 import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
 import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE_FILE;
 import static jdk.jpackage.internal.StandardBundlerParam.VERSION;
@@ -130,8 +129,7 @@ static String getInstallDir(
     }
 
     public MacBaseInstallerBundler() {
-        appImageBundler = new MacAppBundler()
-                .setDependentTask(true);
+        appImageBundler = new MacAppBundler();
     }
 
     protected void validateAppImageAndBundeler(
@@ -177,36 +175,6 @@ protected void validateAppImageAndBundeler(
         }
     }
 
-    protected Path prepareAppBundle(Map<String, ? super Object> params)
-            throws PackagerException, IOException {
-        Path appDir;
-        Path appImageRoot = APP_IMAGE_TEMP_ROOT.fetchFrom(params);
-        Path predefinedImage =
-                StandardBundlerParam.getPredefinedAppImage(params);
-        if (predefinedImage != null) {
-            appDir = appImageRoot.resolve(APP_NAME.fetchFrom(params) + ".app");
-            FileUtils.copyRecursive(predefinedImage, appDir,
-                    LinkOption.NOFOLLOW_LINKS);
-
-            // Create PackageFile if predefined app image is not signed
-            if (!StandardBundlerParam.isRuntimeInstaller(params) &&
-                    !new MacAppImageFileExtras(PREDEFINED_APP_IMAGE_FILE.fetchFrom(params)).signed()) {
-                new PackageFile(APP_NAME.fetchFrom(params)).save(
-                        ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT.resolveAt(appDir));
-                // We need to re-sign app image after adding ".package" to it.
-                // We only do this if app image was not signed which means it is
-                // signed with ad-hoc signature. App bundles with ad-hoc
-                // signature are sealed, but without a signing identity, so we
-                // need to re-sign it after modification.
-                MacAppImageBuilder.signAppBundle(params, appDir, "-", null, null);
-            }
-        } else {
-            appDir = appImageBundler.execute(params, appImageRoot);
-        }
-
-        return appDir;
-    }
-
     @Override
     public String getBundleType() {
         return "INSTALLER";