Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8246212: JPKG001-012: application icon is missing in Control Panel Ad…
…d/Remove

Reviewed-by: herrick, almatvee
  • Loading branch information
Alexey Semenyuk committed Jun 23, 2020
1 parent 2993654 commit d85ff3c7f08daaf813f5464bd0bedd9891533446
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
@@ -307,10 +307,12 @@ private void prepareProto(Map<String, ? super Object> params)
// Ignore custom icon if any as we don't want to copy anything in
// Java Runtime image.
installerIcon = ApplicationLayout.javaRuntime()
.resolveAt(appDir.toPath())
.runtimeDirectory()
.resolve(Path.of("bin", "java.exe"));
} else {
installerIcon = ApplicationLayout.windowsAppImage()
.resolveAt(appDir.toPath())
.launchersDirectory()
.resolve(APP_NAME.fetchFrom(params) + ".exe");
}
@@ -87,8 +87,10 @@
<?endif?>

<CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />

<?ifdef JpIcon ?>
<CustomAction Id="JpSetARPPRODUCTICON" Property="ARPPRODUCTICON" Value="[INSTALLDIR]$(var.JpIcon)" />
<Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
<Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
<?endif?>

<UI>
@@ -140,9 +142,6 @@

<InstallExecuteSequence>
<Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize">Not Installed</Custom>
<?ifdef JpIcon ?>
<Custom Action="JpSetARPPRODUCTICON" After="JpSetARPINSTALLLOCATION">Not Installed</Custom>
<?endif?>
</InstallExecuteSequence>
</Product>
</Wix>

0 comments on commit d85ff3c

Please sign in to comment.