Follow up fix after config files compared

Author: alexeysemenyukoracle

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

@@ -165,7 +165,7 @@ String volumeName() {
     String createVolumeUrlLocation() throws IOException {
         final var volumeParentDir = volumePath().getParent();
         Files.createDirectories(volumeParentDir);
-        // Url should end with '/' and it should be real path (no symbolic links).
+        // The URL should end with '/' and it should be real path (no symbolic links).
         return volumeParentDir.toRealPath().resolve(volumePath().getFileName()).toUri().toString() + File.separator;
     }
 
@@ -222,9 +222,9 @@ private void prepareDMGSetupScript() throws IOException {
         data.put("DEPLOY_VOLUME_URL", createVolumeUrlLocation());
 
         // Full path to background image, so we can find it.
-        data.put("DEPLOY_BG_FILE", bgImageFileInMountedDmg().toString());
+        data.put("DEPLOY_BG_FILE", bgImageFileInMountedDmg().toAbsolutePath().toString());
 
-        data.put("DEPLOY_VOLUME_PATH", volumePath().toString());
+        data.put("DEPLOY_VOLUME_PATH", volumePath().toAbsolutePath().toString());
         data.put("DEPLOY_APPLICATION_NAME", pkg.app().name());
 
         String targetItem = pkg.relativeInstallDir().getFileName().toString();

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

@@ -153,7 +153,7 @@ static Services create(MacPkgPackage pkg, BuildEnv env) {
                             "--scripts", normalizedAbsolutePathString(servicesScriptsDir)));
 
             final var supportPkg = InternalPackageType.SUPPORT.createInternalPackage(
-                    supportRoot, pkg, env, List.of(
+                    supportRoot.resolve("src"), pkg, env, List.of(
                             "--install-location", "/Library/Application Support"));
 
             return new Services(servicesPkg, servicesScriptsDir, supportPkg);
@@ -189,7 +189,7 @@ private void prepareSupportForPkgbuild(MacPkgPackage pkg, BuildEnv env,
             final var supportInstallDir = Path.of("/Library/Application Support").resolve(pkg.packageName());
 
             Map<String, String> data = new HashMap<>(servicesSubstitutionData);
-            data.put("APP_INSTALLATION_FOLDER", mainInstallDir.toString());
+            data.put("APP_INSTALLATION_FOLDER", enqouter.applyTo(mainInstallDir.toString()));
             data.put("SUPPORT_INSTALLATION_FOLDER", enqouter.applyTo(supportInstallDir.toString()));
 
             new ShellScriptResource("uninstall.command")

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixAppImageFragmentBuilder.java

@@ -669,6 +669,11 @@ public void createDirectory(final Path dir) throws IOException {
             }
         });
 
+        // The installed "app" directory is never empty as it contains at least ".package" file.
+        // However, the "app" directory in the source app image can be empty because the ".package"
+        // file is picked from the build config directory, not from the source app image.
+        Optional.ofNullable(installedAppImage).map(ApplicationLayout::appDirectory).ifPresent(emptyDirs::remove);
+
         List<String> componentIds = new ArrayList<>();
         for (var dir : emptyDirs) {
             componentIds.add(addComponent(xml, dir, Component.CreateFolder,

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixUiFragmentBuilder.java

@@ -62,9 +62,9 @@ void initFromParams(BuildEnv env, WinMsiPackage pkg) {
 
         withInstallDirChooserDlg = pkg.withInstallDirChooser();
 
-        var shortcutFolders = ShortcutsFolder.getForPackage(pkg);
+        final var shortcutFolders = ShortcutsFolder.getForPackage(pkg);
 
-        withShortcutPromptDlg = !shortcutFolders.isEmpty();
+        withShortcutPromptDlg = !shortcutFolders.isEmpty() && pkg.withShortcutPrompt();
 
         customDialogs = new ArrayList<>();