Merge branch 'JDK-8333664-pkg' into JDK-8333664

Author: alexeysemenyukoracle

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

@@ -25,53 +25,20 @@
 
 package jdk.jpackage.internal;
 
-import jdk.jpackage.internal.model.ConfigException;
-import java.io.IOException;
+import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
+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.SIGN_BUNDLE;
+
 import java.nio.file.Files;
 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;
-import static jdk.jpackage.internal.StandardBundlerParam.SIGN_BUNDLE;
-import jdk.jpackage.internal.util.FileUtils;
+import jdk.jpackage.internal.model.ConfigException;
 
 public abstract class MacBaseInstallerBundler extends AbstractBundler {
 
-    static final BundlerParamInfo<Path> IMAGES_ROOT =
-            new BundlerParamInfo<>(
-            "imagesRoot",
-            Path.class,
-            params -> {
-                final var env = BuildEnvFromParams.BUILD_ENV.fetchFrom(params);
-                return env.buildRoot().resolve("images");
-            },
-            (s, p) -> null);
-
-    private final BundlerParamInfo<Path> APP_IMAGE_TEMP_ROOT =
-            new BundlerParamInfo<>(
-            "mac.app.imageRoot",
-            Path.class,
-            params -> {
-                Path imageDir = IMAGES_ROOT.fetchFrom(params);
-                try {
-                    if (!IOUtils.exists(imageDir)) {
-                        Files.createDirectories(imageDir);
-                    }
-                    return Files.createTempDirectory(
-                            imageDir, "image-");
-                } catch (IOException e) {
-                    return imageDir.resolve(getID()+ ".image");
-                }
-            },
-            (s, p) -> Path.of(s));
-
     public static final BundlerParamInfo<String> SIGNING_KEY_USER =
             new BundlerParamInfo<>(
             Arguments.CLIOptions.MAC_SIGNING_KEY_NAME.getId(),
@@ -86,48 +53,6 @@ public abstract class MacBaseInstallerBundler extends AbstractBundler {
             params -> "",
             null);
 
-    public static final BundlerParamInfo<String> INSTALLER_SIGN_IDENTITY =
-            new BundlerParamInfo<>(
-            Arguments.CLIOptions.MAC_INSTALLER_SIGN_IDENTITY.getId(),
-            String.class,
-            params -> "",
-            null);
-
-    public static final BundlerParamInfo<String> MAC_INSTALLER_NAME =
-            new BundlerParamInfo<> (
-            "mac.installerName",
-            String.class,
-            params -> {
-                String nm = INSTALLER_NAME.fetchFrom(params);
-                if (nm == null) return null;
-
-                String version = VERSION.fetchFrom(params);
-                if (version == null) {
-                    return nm;
-                } else {
-                    return nm + "-" + version;
-                }
-            },
-            (s, p) -> s);
-
-     // Returns full path to installation directory
-     static String getInstallDir(
-            Map<String, ? super Object>  params, boolean defaultOnly) {
-        String returnValue = INSTALL_DIR.fetchFrom(params);
-        if (defaultOnly && returnValue != null) {
-            Log.info(I18N.getString("message.install-dir-ignored"));
-            returnValue = null;
-        }
-        if (returnValue == null) {
-            if (StandardBundlerParam.isRuntimeInstaller(params)) {
-                returnValue = "/Library/Java/JavaVirtualMachines";
-            } else {
-               returnValue = "/Applications";
-            }
-        }
-        return returnValue;
-    }
-
     public MacBaseInstallerBundler() {
         appImageBundler = new MacAppBundler();
     }

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

@@ -24,11 +24,8 @@
  */
 package jdk.jpackage.internal;
 
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
-import java.util.Optional;
-import java.util.function.Predicate;
 import jdk.jpackage.internal.model.Launcher;
 import jdk.jpackage.internal.model.MacApplication;
 import jdk.jpackage.internal.model.Package;
@@ -39,21 +36,12 @@
  */
 public final class MacLaunchersAsServices extends UnixLaunchersAsServices {
 
-    private MacLaunchersAsServices(BuildEnv env, Package pkg) {
+    MacLaunchersAsServices(BuildEnv env, Package pkg) {
         super(env.appImageDir(), pkg.app(), List.of(), launcher -> {
             return new MacLauncherAsService(env, pkg, launcher);
         });
     }
 
-    static Optional<? extends ShellCustomAction> create(BuildEnv env, Package pkg) {
-        if (pkg.isRuntimeInstaller()) {
-            return Optional.empty();
-        } else {
-            return Optional.of(new MacLaunchersAsServices(env, pkg))
-                    .filter(Predicate.not(MacLaunchersAsServices::isEmpty));
-        }
-    }
-
     public static Path getServicePListFileName(String bundleIdentifier,
             String launcherName) {
         String baseName = launcherName.replaceAll("[\\s]", "_");