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

…doptium#162
douph1 · May 17, 2021 · 045a2a4 · 045a2a4
1 parent a0dc17c
commit 045a2a4
Show file tree

Hide file tree

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

diff --git a/wix/Main.wxs.template b/wix/Main.wxs.template
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <?include $(sys.CURRENTDIR)Includes\$(var.ProductSku).Variables.wxi ?>
+  <?include $(sys.CURRENTDIR)\Workdir\$(var.OutputBaseFilename)-$(var.ProductSku).Variables.wxi ?>
 
   <Product Id="$(var.ProductId)" Name="$(var.ProductNameWithVersion)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.ProductManufacturer)" UpgradeCode="$(var.ProductUpgradeCode)">
     <Package Description="$(var.PackageDescription)" Manufacturer="$(var.ProductManufacturer)" InstallerVersion="200" Compressed="yes" />
@@ -227,6 +227,11 @@
     <WixVariable Id="WixUIBannerBmp" Value="{vendor_branding_banner}" />
     <UI>
       <UIRef Id="WixUI_FeatureTree" />
+      <?if $(var.license_shown)=0 ?>
+        <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg"  Order="3">1</Publish>
+        <!-- skip the page on the way back too -->
+        <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg"  Order="3">1</Publish>
+      <?endif?>
     </UI>
   </Product>
 </Wix>