From f0ea38b3874ac627766768cbcd13f4be68c53797 Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Fri, 7 Feb 2025 19:58:51 +0000
Subject: [PATCH] 8349509: [macos] Clean up macOS dead code in jpackage

Reviewed-by: asemenyuk
---
 .../jdk/jpackage/internal/MacAppImageBuilder.java  |  9 ++-------
 .../jdk/jpackage/internal/MacDmgBundler.java       | 14 ++++----------
 .../jdk/jpackage/internal/MacPkgBundler.java       | 10 +---------
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
index 4b2920391a6..dea7f4c4e2e 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -51,7 +51,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
-import jdk.internal.util.OperatingSystem;
 import jdk.internal.util.OSVersion;
 import static jdk.jpackage.internal.MacAppBundler.BUNDLE_ID_SIGNING_PREFIX;
 import static jdk.jpackage.internal.MacAppBundler.DEVELOPER_ID_APP_SIGNING_KEY;
@@ -419,12 +418,8 @@ public class MacAppImageBuilder extends AbstractAppImageBuilder {
                 signAppBundle(params, root, "-", null, null);
             }
             restoreKeychainList(params);
-        } else if (OperatingSystem.isMacOS()) {
-            signAppBundle(params, root, "-", null, null);
         } else {
-            // Calling signAppBundle() without signingIdentity will result in
-            // unsigning app bundle
-            signAppBundle(params, root, null, null, null);
+            signAppBundle(params, root, "-", null, null);
         }
     }
 
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
index 3de8ef5ee2b..484080c3fb6 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacDmgBundler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, 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
@@ -65,13 +65,6 @@ public class MacDmgBundler extends MacBaseInstallerBundler {
 
     static final String DEFAULT_LICENSE_PLIST="lic_template.plist";
 
-    public static final BundlerParamInfo<String> INSTALLER_SUFFIX =
-            new StandardBundlerParam<> (
-            "mac.dmg.installerName.suffix",
-            String.class,
-            params -> "",
-            (s, p) -> s);
-
     public Path bundle(Map<String, ? super Object> params,
             Path outdir) throws PackagerException {
         Log.verbose(MessageFormat.format(I18N.getString("message.building-dmg"),
@@ -276,9 +269,10 @@ public class MacDmgBundler extends MacBaseInstallerBundler {
             Files.createDirectories(imagesRoot);
         }
 
-        Path protoDMG = imagesRoot.resolve(APP_NAME.fetchFrom(params) +"-tmp.dmg");
+        Path protoDMG = imagesRoot.resolve(APP_NAME.fetchFrom(params)
+                + "-tmp.dmg");
         Path finalDMG = outdir.resolve(MAC_INSTALLER_NAME.fetchFrom(params)
-                + INSTALLER_SUFFIX.fetchFrom(params) + ".dmg");
+                + ".dmg");
 
         Path srcFolder = appLocation.getParent();
         if (StandardBundlerParam.isRuntimeInstaller(params)) {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
index a4345ecf764..c2bd0576a38 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -140,13 +140,6 @@ public class MacPkgBundler extends MacBaseInstallerBundler {
                 },
             (s, p) -> s);
 
-    public static final BundlerParamInfo<String> INSTALLER_SUFFIX =
-            new StandardBundlerParam<> (
-            "mac.pkg.installerName.suffix",
-            String.class,
-            params -> "",
-            (s, p) -> s);
-
     public Path bundle(Map<String, ? super Object> params,
             Path outdir) throws PackagerException {
         Log.verbose(MessageFormat.format(I18N.getString("message.building-pkg"),
@@ -593,7 +586,6 @@ public class MacPkgBundler extends MacBaseInstallerBundler {
 
             // build final package
             Path finalPKG = outdir.resolve(MAC_INSTALLER_NAME.fetchFrom(params)
-                    + INSTALLER_SUFFIX.fetchFrom(params)
                     + ".pkg");
             Files.createDirectories(outdir);