stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8254783: jpackage fails on Windows when application name differs from installer name

Browse Source 
Reviewed-by: asemenyuk, kizune, almatvee
This commit is contained in:
Andy Herrick 2020-10-20 22:54:19 +00:00
parent 3ccf4877a8
commit afc967fcd0
1 changed files with 8 additions and 1 deletions

9
src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinMsiBundler.java

@ -306,15 +306,22 @@ public class WinMsiBundler extends AbstractBundler {
throws PackagerException, IOException {
Path appImage = StandardBundlerParam.getPredefinedAppImage(params);
Path appDir;
String appName;
// we either have an application image or need to build one
if (appImage != null) {
appDir = MSI_IMAGE_DIR.fetchFrom(params).resolve(APP_NAME.fetchFrom(params));
// copy everything from appImage dir into appDir/name
IOUtils.copyRecursive(appImage, appDir);
try {
appName = AppImageFile.load(appDir).getLauncherName();
} catch (Exception e) {
appName = APP_NAME.fetchFrom(params);
}
} else {
appDir = appImageBundler.execute(params, MSI_IMAGE_DIR.fetchFrom(
params));
appName = APP_NAME.fetchFrom(params);
}
// Configure installer icon
@ -331,7 +338,7 @@ public class WinMsiBundler extends AbstractBundler {
installerIcon = ApplicationLayout.windowsAppImage()
.resolveAt(appDir)
.launchersDirectory()
.resolve(APP_NAME.fetchFrom(params) + ".exe");
.resolve(appName + ".exe");
}
installerIcon = installerIcon.toAbsolutePath();