Skip to content

Stable default location #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Okeanos wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Stable default location #986

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b59292
Changed INSTALLDIR to fixed path to fix #422 and #600
adipiciu Aug 23, 2024
cffc155
fix: apply formatting rules and remove unnecessary trailing whitespace
Okeanos Aug 23, 2024
c5d51ed
adjust folder naming to be consistent across platforms to `temurin-<v…
Okeanos Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions wix/Includes/OpenJDK.Variables.wxi.template
View file
Open in desktop
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.ProductVersion)-$(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.ProductVersion)-$(var.JVM)" ?>
<?define AppFolder="temurin-$(var.ProductMajorVersion)-jdk" ?>
<?endif?>

<!-- Registry key change with new numbering format since Java 9 -->
Expand All @@ -46,16 +46,16 @@
<?define OracleJavasoftBaseKey="JRE" ?>
<?else?>
<?define OracleJavasoftBaseKey="JDK" ?>
<?endif?>
<?endif?>
<?else?>
<?define OracleVersionKey="1.8" ?>
<?if $(env.PRODUCT_CATEGORY)="jre"?>
<?define OracleJavasoftBaseKey="Java Runtime Environment" ?>
<?else?>
<?define OracleJavasoftBaseKey="Java Development Kit" ?>
<?endif?>
<?endif?>
<?endif?>

<?if $(var.JVM)="openj9" ?>
<?define license="license-OpenJ9.en-us.rtf" ?>
<?define license_shown="1" ?>
Expand Down Expand Up @@ -92,7 +92,7 @@
<?else?>
<?define DllPath="no DllPath known for $(var.JVM)" ?>
<?endif?>

<!-- Static settings, DO NOT TOUCH or upgrades will break! -->
<?define RTMProductVersion="1.0.0" ?>
</Include>