Do not require users to explicitly accept the terms of the GPLv2+CE a…

…doptium#162
douph1 · Apr 15, 2021 · 69d7f93 · 69d7f93
1 parent 07eb752
commit 69d7f93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/wix/Includes/OpenJDK.Variables.wxi.template b/wix/Includes/OpenJDK.Variables.wxi.template
@@ -57,9 +57,11 @@
   <?endif?>
 
   <?if $(var.JVM)="openj9" ?>
-    <?define Licence="license-OpenJ9.en-us.rtf" ?>
+    <?define licence="license-OpenJ9.en-us.rtf" ?>
+    <?define license_shown="1" ?>
   <?elseif $(var.JVM)="hotspot" ?>
-    <?define Licence="license-GPLv2+CE.en-us.rtf" ?>
+    <?define licence="license-GPLv2+CE.en-us.rtf" ?>
+    <?define license_shown="0" ?>
   <?else?>
     <?define Licence="no licence defined for $(var.JVM)" ?>
   <?endif?>

diff --git a/wix/Main.wxs.template b/wix/Main.wxs.template
@@ -222,6 +222,7 @@
       <ComponentGroupRef Id="SrcFiles" />
     </Feature> -->
 
+    <Property Id="LicenseAccepted" Value="$(var.license_shown)"/>
     <WixVariable Id="WixUILicenseRtf" Value="$(var.SetupResourcesDir)\$(var.license)" />
     <WixVariable Id="WixUIDialogBmp" Value="{vendor_branding_dialog}" />
     <WixVariable Id="WixUIBannerBmp" Value="{vendor_branding_banner}" />