Re-added ability for vendor to choose not to show the end-user licens…

…e agreement
adoptium · Apr 30, 2024 · 434a247 · 434a247
1 parent ab6da46
commit 434a247
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/wix/Includes/OpenJDK.Variables.wxi.template b/wix/Includes/OpenJDK.Variables.wxi.template
@@ -60,8 +60,13 @@
     <?define license="license-OpenJ9.en-us.rtf" ?>
     <?define license_shown="1" ?>
   <?elseif $(var.JVM)="hotspot" ?>
-    <?define license="license-GPLv2+CE.en-us.rtf" ?>
-    <?define license_shown="0" ?>
+    <?if "{vendor}"="Microsoft"?>
+      <?define license="license-GPLv2+CE.en-us.rtf" ?>
+      <?define license_shown="1" ?> <!-- Show license agreement dialog -->
+    <?else?>
+      <?define license="license-GPLv2+CE.en-us.rtf" ?>
+      <?define license_shown="0" ?> <!-- Showing GPLv2 License is optional. Do not show it here -->
+    <?endif?>
   <?else?>
     <?define license="no licence defined for $(var.JVM)" ?>
     <?define license_shown="1" ?>

diff --git a/wix/Main.wxs.template b/wix/Main.wxs.template
@@ -298,13 +298,18 @@
 
     <UI>
       <ui:WixUI Id="WixUI_FeatureTree" />
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg"
-        Order="3" />
-      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog"
-        Value="CustomInstallScopeDlg" Order="3" />
+      <?if $(var.license_shown)=1 ?>
+        <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg"
+          Order="3" />
+        <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog"
+          Value="CustomInstallScopeDlg" Order="3" />
+        <Publish Dialog="CustomInstallScopeDlg" Control="Back" Event="NewDialog"
+          Value="LicenseAgreementDlg" />
+      <?else?>
+        <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="CustomInstallScopeDlg"
+          Order="3" />
+      <?endif?>
 
-      <Publish Dialog="CustomInstallScopeDlg" Control="Back" Event="NewDialog"
-        Value="LicenseAgreementDlg" />
       <Publish Dialog="CustomInstallScopeDlg" Control="Next" Event="DoAction"
         Value="CustomSetPerMachineFolder" Condition='WixAppFolder="WixPerMachineFolder"' Order="1" />
       <Publish Dialog="CustomInstallScopeDlg" Control="Next" Event="DoAction"