Skip to content

Commit

Permalink
adjust folder naming to be consistent across platforms to `temurin-<v…
Browse files Browse the repository at this point in the history
…er>-<jre|jdk>`

See #789 (comment) for
details.

Fixes #422

Signed-off-by: Nikolas Grottendieck <[email protected]>
  • Loading branch information
Okeanos committed Aug 23, 2024
1 parent cffc155 commit c5d51ed
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions wix/Includes/OpenJDK.Variables.wxi.template
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<?define FeatureMainDescription="!(loc.JREFeatureMainDescription)" ?>

<?define ProductCategory="JRE" ?>
<?define AppFolder="jre-$(var.ProductMajorVersion)-$(var.JVM)" ?>
<?define AppFolder="temurin-$(var.ProductMajorVersion)-jre" ?>
<?else?>
<?define ProductName="!(loc.JDKProductName)" ?>
<?define ProductNameWithVersion="!(loc.JDKProductName) $(var.ProductVersionString) $(var.Arch)" ?>
Expand All @@ -36,7 +36,7 @@
<?define FeatureMainDescription="!(loc.JDKFeatureMainDescription)" ?>

<?define ProductCategory="JDK" ?>
<?define AppFolder="jdk-$(var.ProductMajorVersion)-$(var.JVM)" ?>
<?define AppFolder="temurin-$(var.ProductMajorVersion)-jdk" ?>
<?endif?>

<!-- Registry key change with new numbering format since Java 9 -->
Expand Down

0 comments on commit c5d51ed

Please sign in to comment.