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

8246212: JPKG001-012: application icon is missing in Control Panel Add/Remove

Browse Source 
Reviewed-by: herrick, almatvee
This commit is contained in:
Alexey Semenyuk 2020-06-23 13:42:57 -04:00
parent 29936542ad
commit d85ff3c7f0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/WinMsiBundler.java
View File

@ -307,10 +307,12 @@ public class WinMsiBundler extends AbstractBundler {
// Ignore custom icon if any as we don't want to copy anything in // Ignore custom icon if any as we don't want to copy anything in
// Java Runtime image. // Java Runtime image.
installerIcon = ApplicationLayout.javaRuntime() installerIcon = ApplicationLayout.javaRuntime()
.resolveAt(appDir.toPath())
.runtimeDirectory() .runtimeDirectory()
.resolve(Path.of("bin", "java.exe")); .resolve(Path.of("bin", "java.exe"));
} else { } else {
installerIcon = ApplicationLayout.windowsAppImage() installerIcon = ApplicationLayout.windowsAppImage()
.resolveAt(appDir.toPath())
.launchersDirectory() .launchersDirectory()
.resolve(APP_NAME.fetchFrom(params) + ".exe"); .resolve(APP_NAME.fetchFrom(params) + ".exe");
} }

7
src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/main.wxs
View File

@ -87,8 +87,10 @@
<?endif?> <?endif?>
<CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" /> <CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
<?ifdef JpIcon ?> <?ifdef JpIcon ?>
<CustomAction Id="JpSetARPPRODUCTICON" Property="ARPPRODUCTICON" Value="[INSTALLDIR]$(var.JpIcon)" /> <Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
<Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
<?endif?> <?endif?>
<UI> <UI>
@ -140,9 +142,6 @@
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize">Not Installed</Custom> <Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize">Not Installed</Custom>
<?ifdef JpIcon ?>
<Custom Action="JpSetARPPRODUCTICON" After="JpSetARPINSTALLLOCATION">Not Installed</Custom>
<?endif?>
</InstallExecuteSequence> </InstallExecuteSequence>
</Product> </Product>
</Wix> </Wix>