Add MacPackage to the model

Author: alexeysemenyukoracle

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

@@ -32,6 +32,7 @@
 import jdk.jpackage.internal.model.MacDmgPackage;
 import jdk.jpackage.internal.model.MacApplication;
 import jdk.jpackage.internal.model.MacDmgPackageMixin;
+import jdk.jpackage.internal.model.MacPackage;
 
 final class MacDmgPackageBuilder {
 
@@ -54,7 +55,7 @@ List<Path> validatedDmgContent() {
     }
 
     MacDmgPackage create() throws ConfigException {
-        final var pkg = pkgBuilder.create();
+        final var pkg = MacPackage.create(pkgBuilder.create());
 
         return MacDmgPackage.create(pkg, new MacDmgPackageMixin.Stub(
                 Optional.ofNullable(icon).or(((MacApplication)pkg.app())::icon),

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

@@ -27,6 +27,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import jdk.jpackage.internal.model.ConfigException;
+import jdk.jpackage.internal.model.MacPackage;
 import jdk.jpackage.internal.model.MacPkgPackage;
 import jdk.jpackage.internal.model.MacPkgPackageMixin;
 import jdk.jpackage.internal.model.SigningConfig;
@@ -43,7 +44,7 @@ MacPkgPackageBuilder signingBuilder(SigningConfigBuilder v) {
     }
 
     MacPkgPackage create() throws ConfigException {
-        return MacPkgPackage.create(pkgBuilder.create(),
+        return MacPkgPackage.create(MacPackage.create(pkgBuilder.create()),
                 new MacPkgPackageMixin.Stub(createSigningConfig()));
     }
 

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacPackage.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.model;
+
+import java.nio.file.Path;
+import jdk.jpackage.internal.util.CompositeProxy;
+
+public interface MacPackage extends Package {
+
+    @Override
+    default AppImageLayout appImageLayout() {
+        if (isRuntimeInstaller()) {
+            return RUNTIME_PACKAGE_LAYOUT;
+        } else {
+            return Package.super.appImageLayout();
+        }
+    }
+
+    public static MacPackage create(Package pkg) {
+        return CompositeProxy.create(MacPackage.class, pkg);
+    }
+
+    public final static RuntimeLayout RUNTIME_PACKAGE_LAYOUT = RuntimeLayout.create(Path.of("Contents/Home"));
+}