From a0dc17c9eed0a7fdc501767e57222ebc4ef01904 Mon Sep 17 00:00:00 2001
From: douph1 <45632394+douph1@users.noreply.github.com>
Date: Thu, 15 Apr 2021 10:31:05 +0200
Subject: [PATCH] fix concurent build and merge template

---
 wix/Build.OpenJDK_generic.cmd                 |  32 ++-
 wix/Includes/OpenJDK.Variables.wxi.template   |  42 ++--
 wix/Main.dragonwell.wxs.template              | 228 -----------------
 wix/Main.openj9.wxs.template                  | 232 ------------------
 ...hotspot.wxs.template => Main.wxs.template} |   2 +-
 5 files changed, 43 insertions(+), 493 deletions(-)
 delete mode 100644 wix/Main.dragonwell.wxs.template
 delete mode 100644 wix/Main.openj9.wxs.template
 rename wix/{Main.hotspot.wxs.template => Main.wxs.template} (99%)

diff --git a/wix/Build.OpenJDK_generic.cmd b/wix/Build.OpenJDK_generic.cmd
index 7dafb74cd..4288f634c 100644
--- a/wix/Build.OpenJDK_generic.cmd
+++ b/wix/Build.OpenJDK_generic.cmd
@@ -100,16 +100,6 @@ REM See folder e.g. "C:\Program Files (x86)\Windows Kits\[10]\bin\[10.0.16299.0]
 SET WIN_SDK_MAJOR_VERSION=10
 SET WIN_SDK_FULL_VERSION=10.0.17763.0
 
-REM find all *.wxi.template,*.wxl.template,*.wxs.template files and replace text with configurations
-SETLOCAL ENABLEDELAYEDEXPANSION
-FOR /f %%i IN ('dir /s /b *.wxi.template,*.wxl.template,*.wxs.template') DO (
-    SET INPUT_FILE=%%i
-    SET OUTPUT_FILE=!INPUT_FILE:.template=%!
-    ECHO string replacement input !INPUT_FILE! output !OUTPUT_FILE!
-    powershell -Command "(gc -Raw -encoding utf8 %%i) -replace '{vendor}', '!VENDOR!' -replace '{vendor_branding_logo}', '!VENDOR_BRANDING_LOGO!' -replace '{vendor_branding_banner}', '!VENDOR_BRANDING_BANNER!' -replace '{vendor_branding_dialog}', '!VENDOR_BRANDING_DIALOG!' -replace '{vendor_branding}', '!VENDOR_BRANDING!' -replace '{product_help_link}', '!PRODUCT_HELP_LINK!' -replace '{product_support_link}', '!PRODUCT_SUPPORT_LINK!' -replace '{product_update_info_link}', '!PRODUCT_UPDATE_INFO_LINK!' | Out-File -encoding utf8 !OUTPUT_FILE!"
-)
-ENDLOCAL
-
 REM
 REM Nothing below this line need to be changed normally.
 REM
@@ -180,6 +170,15 @@ FOR %%A IN (%ARCH%) DO (
     ECHO Source dir used : !REPRO_DIR!
 
     SET OUTPUT_BASE_FILENAME=!PRODUCT_SKU!!PRODUCT_MAJOR_VERSION!-!PRODUCT_CATEGORY!_!FOLDER_PLATFORM!_windows_!PACKAGE_TYPE!-!PRODUCT_FULL_VERSION!
+    REM find all *.wxi.template,*.wxl.template,*.wxs.template files and replace text with configurations
+    FOR /f %%i IN ('dir /s /b *.wxi.template,*.wxl.template,*.wxs.template') DO (
+        SET INPUT_FILE=%%i
+        REM Prevent concurrency issues if multiple builds are running in parallel.
+        SET OUTPUT_FILE=!OUTPUT_BASE_FILENAME!-!INPUT_FILE:.template=%!
+        ECHO string replacement input !INPUT_FILE! output !OUTPUT_FILE!
+        powershell -Command "(gc -Raw -encoding utf8 %%i) -replace '{vendor}', '!VENDOR!' -replace '{vendor_branding_logo}', '!VENDOR_BRANDING_LOGO!' -replace '{vendor_branding_banner}', '!VENDOR_BRANDING_BANNER!' -replace '{vendor_branding_dialog}', '!VENDOR_BRANDING_DIALOG!' -replace '{vendor_branding}', '!VENDOR_BRANDING!' -replace '{product_help_link}', '!PRODUCT_HELP_LINK!' -replace '{product_support_link}', '!PRODUCT_SUPPORT_LINK!' -replace '{product_update_info_link}', '!PRODUCT_UPDATE_INFO_LINK!' | Out-File -encoding utf8 !OUTPUT_FILE!"
+    )
+
     SET CACHE_BASE_FOLDER=Cache
     REM Each build his own cache for concurrent build
     SET CACHE_FOLDER=!CACHE_BASE_FOLDER!\!OUTPUT_BASE_FILENAME!
@@ -210,15 +209,12 @@ FOR %%A IN (%ARCH%) DO (
         )
     )
 
-    REM Prevent concurrency issues if multiple builds are running in parallel.
-	ECHO copy "Main.!PACKAGE_TYPE!.wxs"
-    COPY /Y "Main.!PACKAGE_TYPE!.wxs" "Main-!OUTPUT_BASE_FILENAME!.wxs"
 
     REM Build with extra Source Code feature (needs work)
     REM "!WIX!bin\heat.exe" file "!REPRO_DIR!\lib\src.zip" -out Src-!OUTPUT_BASE_FILENAME!.wxs -gg -srd -cg "SrcFiles" -var var.ReproDir -dr INSTALLDIR -platform !PLATFORM!
     REM "!WIX!bin\heat.exe" dir "!REPRO_DIR!" -out Files-!OUTPUT_BASE_FILENAME!.wxs -t "!SETUP_RESOURCES_DIR!\heat.tools.xslt" -gg -sfrag -scom -sreg -srd -ke -cg "AppFiles" -var var.ProductMajorVersion -var var.ProductMinorVersion -var var.ProductVersionString -var var.MSIProductVersion -var var.ReproDir -dr INSTALLDIR -platform !PLATFORM!
-    REM "!WIX!bin\candle.exe" -arch !PLATFORM! Main-!OUTPUT_BASE_FILENAME!.wxs Files-!OUTPUT_BASE_FILENAME!.wxs Src-!OUTPUT_BASE_FILENAME!.wxs -ext WixUIExtension -ext WixUtilExtension -dProductSku="!PRODUCT_SKU!" -dProductMajorVersion="!PRODUCT_MAJOR_VERSION!" -dProductMinorVersion="!PRODUCT_MINOR_VERSION!" -dProductVersionString="!PRODUCT_SHORT_VERSION!" -dMSIProductVersion="!MSI_PRODUCT_VERSION!" -dProductId="!PRODUCT_ID!" -dReproDir="!REPRO_DIR!" -dSetupResourcesDir="!SETUP_RESOURCES_DIR!" -dCulture="!CULTURE!"
-    REM "!WIX!bin\light.exe" !MSI_VALIDATION_OPTION! Main-!OUTPUT_BASE_FILENAME!.wixobj Files-!OUTPUT_BASE_FILENAME!.wixobj Src-!OUTPUT_BASE_FILENAME!.wixobj -cc !CACHE_FOLDER! -ext WixUIExtension -ext WixUtilExtension -spdb -out "ReleaseDir\!OUTPUT_BASE_FILENAME!.msi" -loc "Lang\!PRODUCT_SKU!.Base.!CULTURE!.wxl" -loc "Lang\!PRODUCT_SKU!.!PACKAGE_TYPE!.!CULTURE!.wxl" -cultures:!CULTURE!
+    REM "!WIX!bin\candle.exe" -arch !PLATFORM! !OUTPUT_BASE_FILENAME!-Main.wxs Files-!OUTPUT_BASE_FILENAME!.wxs Src-!OUTPUT_BASE_FILENAME!.wxs -ext WixUIExtension -ext WixUtilExtension -dProductSku="!PRODUCT_SKU!" -dProductMajorVersion="!PRODUCT_MAJOR_VERSION!" -dProductMinorVersion="!PRODUCT_MINOR_VERSION!" -dProductVersionString="!PRODUCT_SHORT_VERSION!" -dMSIProductVersion="!MSI_PRODUCT_VERSION!" -dProductId="!PRODUCT_ID!" -dReproDir="!REPRO_DIR!" -dSetupResourcesDir="!SETUP_RESOURCES_DIR!" -dCulture="!CULTURE!"
+    REM "!WIX!bin\light.exe" !MSI_VALIDATION_OPTION! Main-!OUTPUT_BASE_FILENAME!.wixobj Files-!OUTPUT_BASE_FILENAME!.wixobj Src-!OUTPUT_BASE_FILENAME!.wixobj -cc !CACHE_FOLDER! -ext WixUIExtension -ext WixUtilExtension -spdb -out "ReleaseDir\!OUTPUT_BASE_FILENAME!.msi" -loc "Lang\!OUTPUT_BASE_FILENAME!-!PRODUCT_SKU!.Base.!CULTURE!.wxl" -loc "Lang\!OUTPUT_BASE_FILENAME!-!PRODUCT_SKU!.!PACKAGE_TYPE!.!CULTURE!.wxl" -cultures:!CULTURE!
 
     REM Clean .cab cache for each run .. Cache is only used inside BuildSetupTranslationTransform.cmd to speed up MST generation
     IF EXIST !CACHE_FOLDER! rmdir /S /Q !CACHE_FOLDER!
@@ -263,7 +259,7 @@ FOR %%A IN (%ARCH%) DO (
 
     ECHO CANDLE
     @ECHO ON
-    "!WIX!bin\candle.exe" -arch !PLATFORM! Main-!OUTPUT_BASE_FILENAME!.wxs Files-!OUTPUT_BASE_FILENAME!.wxs !ITW_WXS! -ext WixUIExtension -ext WixUtilExtension -dIcedTeaWebDir="!ICEDTEAWEB_DIR!" -dProductSku="!PRODUCT_SKU!" -dProductMajorVersion="!PRODUCT_MAJOR_VERSION!" -dProductMinorVersion="!PRODUCT_MINOR_VERSION!" -dProductVersionString="!PRODUCT_SHORT_VERSION!" -dMSIProductVersion="!MSI_PRODUCT_VERSION!" -dProductId="!PRODUCT_ID!" -dProductUpgradeCode="!PRODUCT_UPGRADE_CODE!" -dReproDir="!REPRO_DIR!" -dSetupResourcesDir="!SETUP_RESOURCES_DIR!" -dCulture="!CULTURE!" -dJVM="!PACKAGE_TYPE!"
+    "!WIX!bin\candle.exe" -arch !PLATFORM! !OUTPUT_BASE_FILENAME!-Main.wxs Files-!OUTPUT_BASE_FILENAME!.wxs !ITW_WXS! -ext WixUIExtension -ext WixUtilExtension -dIcedTeaWebDir="!ICEDTEAWEB_DIR!" -dProductSku="!PRODUCT_SKU!" -dProductMajorVersion="!PRODUCT_MAJOR_VERSION!" -dProductMinorVersion="!PRODUCT_MINOR_VERSION!" -dProductVersionString="!PRODUCT_SHORT_VERSION!" -dMSIProductVersion="!MSI_PRODUCT_VERSION!" -dProductId="!PRODUCT_ID!" -dProductUpgradeCode="!PRODUCT_UPGRADE_CODE!" -dReproDir="!REPRO_DIR!" -dSetupResourcesDir="!SETUP_RESOURCES_DIR!" -dCulture="!CULTURE!" -dJVM="!PACKAGE_TYPE!"
     IF ERRORLEVEL 1 (
         ECHO Failed to preprocesses and compiles WiX source files into object files ^(.wixobj^)
         GOTO FAILED
@@ -272,7 +268,7 @@ FOR %%A IN (%ARCH%) DO (
 
     ECHO LIGHT
     @ECHO ON
-    "!WIX!bin\light.exe" Main-!OUTPUT_BASE_FILENAME!.wixobj Files-!OUTPUT_BASE_FILENAME!.wixobj !ITW_WIXOBJ! !MSI_VALIDATION_OPTION! -cc !CACHE_FOLDER! -ext WixUIExtension -ext WixUtilExtension -spdb -out "ReleaseDir\!OUTPUT_BASE_FILENAME!.msi" -loc "Lang\!PRODUCT_SKU!.Base.!CULTURE!.wxl" -loc "Lang\!PRODUCT_SKU!.!PACKAGE_TYPE!.!CULTURE!.wxl" -cultures:!CULTURE!
+    "!WIX!bin\light.exe" Main-!OUTPUT_BASE_FILENAME!.wixobj Files-!OUTPUT_BASE_FILENAME!.wixobj !ITW_WIXOBJ! !MSI_VALIDATION_OPTION! -cc !CACHE_FOLDER! -ext WixUIExtension -ext WixUtilExtension -spdb -out "ReleaseDir\!OUTPUT_BASE_FILENAME!.msi" -loc "Lang\!OUTPUT_BASE_FILENAME!-!PRODUCT_SKU!.Base.!CULTURE!.wxl" -loc "Lang\!OUTPUT_BASE_FILENAME!-!PRODUCT_SKU!.!PACKAGE_TYPE!.!CULTURE!.wxl" -cultures:!CULTURE!
     IF ERRORLEVEL 1 (
         ECHO Failed to links and binds one or more .wixobj files and creates a Windows Installer database ^(.msi or .msm^)
         GOTO FAILED
@@ -352,7 +348,7 @@ FOR %%A IN (%ARCH%) DO (
     REM Remove files we do not need any longer.
     DEL "Files-!OUTPUT_BASE_FILENAME!.wxs"
     DEL "Files-!OUTPUT_BASE_FILENAME!.wixobj"
-    DEL "Main-!OUTPUT_BASE_FILENAME!.wxs"
+    DEL "!OUTPUT_BASE_FILENAME!-Main.wxs"
     DEL "Main-!OUTPUT_BASE_FILENAME!.wixobj"
     IF DEFINED ITW_WXS (
         DEL !ITW_WXS!
diff --git a/wix/Includes/OpenJDK.Variables.wxi.template b/wix/Includes/OpenJDK.Variables.wxi.template
index d306c9de4..7485424c3 100644
--- a/wix/Includes/OpenJDK.Variables.wxi.template
+++ b/wix/Includes/OpenJDK.Variables.wxi.template
@@ -56,23 +56,37 @@
     <?endif?>    
   <?endif?>
   
-  <!-- cf https://github.com/AdoptOpenJDK/openjdk-installer/issues/137 -->
-  <?if $(env.PRODUCT_CATEGORY)="jre"?>
-    <?if $(var.ProductMajorVersion)>=9?>
-        <!-- Prefere Server JVM in Java 9+ x64 -->
-        <?define DllPath="bin\server\jvm.dll" ?>
-    <?else?>
-        <!-- Java 1.8 -->
-        <?if $(env.PLATFORM)="x86"?>
-          <!-- if x86 then client jvm -->
-          <?define DllPath="bin\client\jvm.dll" ?>
-        <?else?>
-          <!-- if x64 then server jvm -->
+  <?if $(var.JVM)="openj9" ?>
+    <?define Licence="license-OpenJ9.en-us.rtf" ?>
+  <?elseif $(var.JVM)="hotspot" ?>
+    <?define Licence="license-GPLv2+CE.en-us.rtf" ?>
+  <?else?>
+    <?define Licence="no licence defined for $(var.JVM)" ?>
+  <?endif?>
+
+  <?if $(var.JVM)="openj9"?>
+    <?define DllPath="bin\server\jvm.dll" ?>
+  <?elseif $(var.JVM)="hotspot" ?>
+    <!-- cf https://github.com/AdoptOpenJDK/openjdk-installer/issues/137 -->
+    <?if $(env.PRODUCT_CATEGORY)="jre"?>
+      <?if $(var.ProductMajorVersion)>=9?>
+          <!-- Prefere Server JVM in Java 9+ x64 -->
           <?define DllPath="bin\server\jvm.dll" ?>
-        <?endif?>
+      <?else?>
+          <!-- Java 1.8 -->
+          <?if $(env.PLATFORM)="x86"?>
+            <!-- if x86 then client jvm -->
+            <?define DllPath="bin\client\jvm.dll" ?>
+          <?else?>
+            <!-- if x64 then server jvm -->
+            <?define DllPath="bin\server\jvm.dll" ?>
+          <?endif?>
+      <?endif?>
+    <?else?>
+      <?define DllPath="no RuntimeLib jvm.dll for JDK since Oracle does not define it" ?>
     <?endif?>
   <?else?>
-    <?define DllPath="no RuntimeLib jvm.dll for JDK since Oracle does not define it" ?>
+    <?define DllPath="no DllPath known for $(var.JVM)" ?>
   <?endif?>
   
   <!-- Static settings, DO NOT TOUCH or upgrades will break! -->
diff --git a/wix/Main.dragonwell.wxs.template b/wix/Main.dragonwell.wxs.template
deleted file mode 100644
index d8e180fba..000000000
--- a/wix/Main.dragonwell.wxs.template
+++ /dev/null
@@ -1,228 +0,0 @@
-<?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 ?>
-
-  <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" />
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeDenied)"/>
-    <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" CompressionLevel="high" />
-    <Property Id="ARPHELPLINK" Value="!(loc.ProductHelpLink)" />
-    <Property Id="ARPURLINFOABOUT" Value="!(loc.ProductUrlInfoAbout)" />
-    <Property Id="ARPURLUPDATEINFO" Value="!(loc.ProductUrlUpdateInfo)" />
-    <Property Id="ALLUSERS" Value="2" /> <!-- Allow per User or per Machine setup -->
-    <Property Id="ARPPRODUCTICON" Value="logo.ico" />
-    <Property Id="ORACLE_VERSION_KEY" Value="$(var.OracleVersionKey)" />
-    <Property Id="ORACLE_JAVASOFT_BASE_KEY" Value="$(var.OracleJavasoftBaseKey)" />
-    <Property Id="DLL_PATH" Value="$(var.DllPath)" />
-    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize" />
-    <Icon Id="logo.ico" SourceFile="$(var.SetupResourcesDir)\logo.ico" />
-
-    <!-- Windows 7 and later is required. -->
-    <Condition Message="!(loc.OSVersionRequired)"><![CDATA[Installed OR VersionNT >= 601]]></Condition>
-    <Condition Message="!(loc.ProductIsNotSupportedOnItanium)"><![CDATA[(Not ITANIUM = "Itanium") AND (Not ITANIUM = "Itanium 2")]]></Condition>
-
-    <!--
-      We may need to be able to install JDK in parallel. Therefore an in-place
-      upgrade need to be disabled. Keep the code as reference in case we allow
-      this in future or with JRE.
-      <Upgrade Id="$(var.ProductUpgradeCode)">
-        <UpgradeVersion OnlyDetect="yes" Minimum="$(var.ProductVersion)" Property="NEWPRODUCTFOUND" IncludeMinimum="no" />
-        <UpgradeVersion Minimum="$(var.RTMProductVersion)" IncludeMinimum="yes" Maximum="$(var.ProductVersion)" Property="UPGRADEFOUND" IncludeMaximum="no" MigrateFeatures="yes" />
-      </Upgrade>
-      <CustomAction Id="PreventDowngrading" Error="!(loc.NewerVersionInstalled)" />
-
-      <InstallExecuteSequence>
-        <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
-        <RemoveExistingProducts After="InstallFinalize" />
-      </InstallExecuteSequence>
-      <InstallUISequence>
-        <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
-      </InstallUISequence>
-    -->
-
-    <!-- Define the directory structure -->
-    <Directory Id="TARGETDIR" Name="SourceDir">
-    <?if $(env.Platform)=x86?>
-        <Directory Id="ProgramFilesFolder">
-            <Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
-                <Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
-            </Directory>
-        </Directory>
-    <?elseif $(env.Platform)=x64?>
-        <Directory Id="ProgramFiles64Folder">
-            <Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
-                <Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
-            </Directory>
-         </Directory>
-    <?elseif $(env.Platform)=arm64?>
-        <Directory Id="ProgramFilesARMFolder" Name="Program Files (Arm)">
-            <Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
-                <Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
-            </Directory>
-         </Directory>
-    <?else?>
-        <!-- unknown arch > build must failed without directory-->
-    <?endif?>
-    </Directory>
-
-    <!--
-      RemoveFolderEx requires that we "remember" the path for uninstall.
-      This workaround is only required for the uninstall.
-    -->
-    <Property Id="INSTALLDIR_PER_MACHINE">
-      <RegistrySearch Id="INSTALLDIR_REGSEARCH_HKLM" Root="HKLM" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="Path" Type="raw" />
-    </Property>
-    <Property Id="INSTALLDIR_PER_USER">
-      <RegistrySearch Id="INSTALLDIR_REGSEARCH_HKCU" Root="HKCU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="Path" Type="raw" />
-    </Property>
-    
-    <CustomAction Id="PerMachineInstall" Property="TARGETDIR" Value="[INSTALLDIR_PER_MACHINE]" Execute="immediate"/>    
-    <CustomAction Id="PerUserInstall" Property="TARGETDIR" Value="[INSTALLDIR_PER_USER]" Execute="immediate"/>
-
-    <InstallExecuteSequence>
-        <Custom Action="PerMachineInstall" Before="CostFinalize">ALLUSERS=1  OR (ALLUSERS=2 AND Privileged)</Custom>
-        <Custom Action="PerUserInstall"    Before="CostFinalize">ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))</Custom>
-    </InstallExecuteSequence>
-
-    <!-- Add the shortcuts to your installer package -->
-    <DirectoryRef Id="INSTALLDIR">
-      <Component Id="CleanupMainInstallDir" Guid="*">
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="Path" Type="string" Value="[INSTALLDIR]" KeyPath="yes" />
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="Main" Type="integer" Value="1" />
-        <!-- We need to use INSTALLDIR variable here or RemoveFolderEx will not remove on "install". -->
-        <util:RemoveFolderEx On="uninstall" Property="INSTALLDIR" />
-        <RemoveFolder Id="PRODUCTMANUFACTURER_REMOVE" Directory="PRODUCTMANUFACTURER" On="uninstall" />
-      </Component>
-      <Component Id="AddToEnvironmentPath" Guid="*">
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="EnvironmentPath" Type="integer" Value="1" KeyPath="yes" />
-      </Component>
-      <Component Id="AddToEnvironmentPathSystem" Guid="*">
-        <Condition>ALLUSERS=1  OR (ALLUSERS=2 AND Privileged)</Condition>
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="EnvironmentPathSetForSystem" Type="integer" Value="1" KeyPath="yes" /> <!-- Only to get a Keypath and can use Guid="*" for having different guid for each installer -->
-        <Environment Id="PATH_SYSTEM" Name="PATH" Value="[INSTALLDIR]bin" Permanent="no" Part="first" Action="set" System="yes" />
-      </Component>
-      <Component Id="AddToEnvironmentPathUser" Guid="*">
-        <Condition>ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))</Condition>
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="EnvironmentPathSetForUser" Type="integer" Value="1" KeyPath="yes" /> <!-- Only to get a Keypath and can use Guid="*" for having different guid for each installer -->
-        <Environment Id="PATH_USER" Name="PATH" Value="[INSTALLDIR]bin" Permanent="no" Part="first" Action="set" System="no" />
-      </Component>
-      <Component Id="SetJavaHomeVariable" Guid="*">
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="JavaHome" Type="integer" Value="1" KeyPath="yes" />
-      </Component>
-      <Component Id="SetJavaHomeVariableSystem" Guid="*">
-        <Condition>ALLUSERS=1  OR (ALLUSERS=2 AND Privileged)</Condition>
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="JavaHomeSetForSystem" Type="integer" Value="1" KeyPath="yes" /> <!-- Only to get a Keypath and can use Guid="*" for having different guid for each installer -->
-        <Environment Id="JAVA_HOME_SYSTEM" Name="JAVA_HOME" Value="[INSTALLDIR]" Permanent="no" Action="set" System="yes" />
-      </Component>
-      <Component Id="SetJavaHomeVariableUser" Guid="*">
-        <Condition>ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))</Condition>
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="JavaHomeSetForUser" Type="integer" Value="1" KeyPath="yes" /> <!-- Only to get a Keypath and can use Guid="*" for having different guid for each installer -->
-        <Environment Id="JAVA_HOME_USER" Name="JAVA_HOME" Value="[INSTALLDIR]" Permanent="no" Action="set" System="no" />
-    </Component>
-      
-      <!-- Add jar launch by double click -->
-      <Component Id="SetJarFileRunWith" Guid="*">
-        <!--
-        https://support.microsoft.com/en-us/help/256986/windows-registry-information-for-advanced-users
-            If you write keys to a key under HKEY_CLASSES_ROOT, the system stores the information under HKEY_LOCAL_MACHINE\Software\Classes.
-            If you write values to a key under HKEY_CLASSES_ROOT, and the key already exists under HKEY_CURRENT_USER\Software\Classes, the system will store the information there instead of under HKEY_LOCAL_MACHINE\Software\Classes.
-
-        HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.jar\OpenWithProgids
-        is automatically created by Windows when running jar file for the first time
-        -->
-        <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\.jar" Type="string" Value="{vendor}.jarfile" KeyPath="yes" />
-        <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\.jar" Type="string" Name="Content Type" Value="application/java-archive" KeyPath="no" />
-
-        <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\{vendor}.jarfile\shell\open\command" Type="string" Value="&quot;[INSTALLDIR]bin\javaw.exe&quot; -jar &quot;%1&quot; %*" KeyPath="no" />
-      </Component>
-      <Component Id="SetOracleJavaSoftKeys" Guid="*">
-        <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]" Name="CurrentVersion" Type="string" Value="[ORACLE_VERSION_KEY]" KeyPath="yes" />
-        <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\[ORACLE_VERSION_KEY]" Name="JavaHome" Type="string" Value="[INSTALLDIR]" KeyPath="no" />
-        <?if $(env.PRODUCT_CATEGORY)="jre"?>
-            <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\[ORACLE_VERSION_KEY]" Name="RuntimeLib" Type="string" Value="[INSTALLDIR][DLL_PATH]" KeyPath="no" />
-            <!-- Oracle dont set RuntimeLib for JDK .. because JRE is "private" JRE so no ?else? -->
-        <?endif?>
-        <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\$(var.ProductVersion)" Name="JavaHome" Type="string" Value="[INSTALLDIR]" KeyPath="no" />
-        <?if $(env.PRODUCT_CATEGORY)="jre"?>
-            <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\$(var.ProductVersion)" Name="RuntimeLib" Type="string" Value="[INSTALLDIR][DLL_PATH]" KeyPath="no" />
-            <!-- Oracle don't set RuntimeLib for JDK .. because JRE is "private" JRE so no ?else? -->
-        <?endif?>
-      </Component>
-      <!-- Add jnlp launch by double click -->
-      <?if $(env.Platform)=x64?>
-        <?if $(env.PRODUCT_MAJOR_VERSION)=8?>
-          <Component Id="SetJNLPFileRunWith" Guid="*">
-            <!--
-            https://support.microsoft.com/en-us/help/256986/windows-registry-information-for-advanced-users
-                If you write keys to a key under HKEY_CLASSES_ROOT, the system stores the information under HKEY_LOCAL_MACHINE\Software\Classes.
-                If you write values to a key under HKEY_CLASSES_ROOT, and the key already exists under HKEY_CURRENT_USER\Software\Classes, the system will store the information there instead of under HKEY_LOCAL_MACHINE\Software\Classes.
-
-            HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.jnlp\OpenWithProgids
-            is automatically created by Windows when running jnlp file for the first time
-            -->
-            <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\.jnlp" Type="string" Value="{vendor}.jnlpfile" KeyPath="yes" />
-            <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\.jnlp" Type="string" Name="Content Type" Value="application/jnlp" KeyPath="no" />
-
-            <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\{vendor}.jnlpfile\shell\open\command" Type="string" Value="&quot;[INSTALLDIR]bin\javaws.exe&quot; -jnlp &quot;%1&quot; %*" KeyPath="no" />
-          </Component>
-        <?endif?>
-      <?endif?>
-    </DirectoryRef>
-
-    <Property Id="JAVASOFT_CURRENTVERSION">
-        <RegistrySearch Id="JAVASOFT_CURRENTVERSION"
-                        Root="HKLM"
-                        Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]"
-                        Name="CurrentVersion"
-                        Type="raw" />
-    </Property>
-     
-    <!-- List of features to install -->
-    <Feature Id="FeatureMain" ConfigurableDirectory="INSTALLDIR" Level="1" Title="$(var.FeatureMainName)" Description="$(var.FeatureMainDescription)" Absent="disallow" Display="expand" AllowAdvertise="no" InstallDefault="local">
-      <ComponentRef Id="CleanupMainInstallDir" />
-      <ComponentGroupRef Id="AppFiles" />
-        <Feature Id="FeatureEnvironment" Level="1" Title="!(loc.FeatureEnvironmentTitle)" Description="!(loc.FeatureEnvironmentDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent">
-          <ComponentRef Id="AddToEnvironmentPath" />
-          <ComponentRef Id="AddToEnvironmentPathSystem" />
-          <ComponentRef Id="AddToEnvironmentPathUser" />
-        </Feature>
-        <Feature Id="FeatureJarFileRunWith" Level="1" Title="!(loc.FeatureJarFileRunWithTitle)" Description="!(loc.FeatureJarFileRunWithDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent">
-          <ComponentRef Id="SetJarFileRunWith" />
-        </Feature>
-      <Feature Id="FeatureJavaHome" Level="2" Title="!(loc.FeatureJavaHomeTitle)" Description="!(loc.FeatureJavaHomeDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent">
-        <ComponentRef Id="SetJavaHomeVariable" />
-        <ComponentRef Id="SetJavaHomeVariableSystem" />
-        <ComponentRef Id="SetJavaHomeVariableUser" />
-      </Feature>
-
-      <Feature Id="FeatureOracleJavaSoft" Level="2" Title="!(loc.FeatureOracleJavaSoftName)" Description="!(loc.FeatureOracleJavaSoftDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent" >
-        <!-- See https://docs.oracle.com/javase/9/install/installation-jdk-and-jre-microsoft-windows-platforms.htm#JSJIG-GUID-47C269A3-5220-412F-9E31-4B8C37A82BFB -->
-        <!-- As Oracle, don't override if current value is already bigger ( newer java ): "a value that is the highest installed version on the system" 
-        Note !! : the reg key is not removed during uninstall if any other installer reference it
-        -->
-        <Condition Level="0"><![CDATA[JAVASOFT_CURRENTVERSION <> "1.8" AND JAVASOFT_CURRENTVERSION > $(var.ProductMajorVersion)]]></Condition>
-        <ComponentRef Id="SetOracleJavaSoftKeys" />
-      </Feature>
-      <?if $(env.Platform)=x64?>
-        <?if $(env.PRODUCT_MAJOR_VERSION)=8?>
-          <Feature Id="FeatureIcedTeaWeb" ConfigurableDirectory="INSTALLDIR" Level="2" Title="!(loc.FeatureIcedTeaWebTitle)" Description="!(loc.FeatureIcedTeaWebDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="local">
-            <ComponentGroupRef Id="IcedTeaWebFiles" />
-            <Feature Id="FeatureJNLPFileRunWith" Level="3" Title="!(loc.FeatureJNLPFileRunWithTitle)" Description="!(loc.FeatureJNLPFileRunWithDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent">
-              <ComponentRef Id="SetJNLPFileRunWith" />
-            </Feature>
-          </Feature>
-        <?endif?>
-      <?endif?>
-    </Feature>
-    <!-- <Feature Id="FeatureSource" ConfigurableDirectory="INSTALLDIR" Level="1" Title="!(loc.FeatureSourceTitle)" Description="!(loc.FeatureSourceDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="local">
-      <ComponentGroupRef Id="SrcFiles" />
-    </Feature> -->
-
-    <WixVariable Id="WixUILicenseRtf" Value="$(var.SetupResourcesDir)\license-GPLv2+CE.en-us.rtf" />
-    <WixVariable Id="WixUIDialogBmp" Value="$(var.SetupResourcesDir)\wix-dialog.bmp" />
-    <WixVariable Id="WixUIBannerBmp" Value="$(var.SetupResourcesDir)\wix-banner.bmp" />
-    <UI>
-      <UIRef Id="WixUI_FeatureTree" />
-    </UI>
-  </Product>
-</Wix>
diff --git a/wix/Main.openj9.wxs.template b/wix/Main.openj9.wxs.template
deleted file mode 100644
index df6b26f1f..000000000
--- a/wix/Main.openj9.wxs.template
+++ /dev/null
@@ -1,232 +0,0 @@
-<?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 ?>
-
-  <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" />
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeDenied)"/>
-    <Media Id="1" Cabinet="Data1.cab" EmbedCab="yes" CompressionLevel="high" />
-    <Property Id="ARPHELPLINK" Value="!(loc.ProductHelpLink)" />
-    <Property Id="ARPURLINFOABOUT" Value="!(loc.ProductUrlInfoAbout)" />
-    <Property Id="ARPURLUPDATEINFO" Value="!(loc.ProductUrlUpdateInfo)" />
-    <Property Id="ALLUSERS" Value="2" /> <!-- Allow per User or per Machine setup -->
-    <Property Id="ARPPRODUCTICON" Value="logo.ico" />
-    <Property Id="ORACLE_VERSION_KEY" Value="$(var.OracleVersionKey)" />
-    <Property Id="ORACLE_JAVASOFT_BASE_KEY" Value="$(var.OracleJavasoftBaseKey)" />
-    <Property Id="DLL_PATH" Value="bin\server\jvm.dll" />
-    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize" />
-    <Icon Id="logo.ico" SourceFile="{vendor_branding_logo}" />
-
-    <!-- Windows 7 and later is required. -->
-    <Condition Message="!(loc.OSVersionRequired)"><![CDATA[Installed OR VersionNT >= 601]]></Condition>
-    <Condition Message="!(loc.ProductIsNotSupportedOnItanium)"><![CDATA[(Not ITANIUM = "Itanium") AND (Not ITANIUM = "Itanium 2")]]></Condition>
-
-    <!--
-      We may need to be able to install JDK in parallel. Therefore an in-place
-      upgrade need to be disabled. Keep the code as reference in case we allow
-      this in future or with JRE.
-      <Upgrade Id="$(var.ProductUpgradeCode)">
-        <UpgradeVersion OnlyDetect="yes" Minimum="$(var.ProductVersion)" Property="NEWPRODUCTFOUND" IncludeMinimum="no" />
-        <UpgradeVersion Minimum="$(var.RTMProductVersion)" IncludeMinimum="yes" Maximum="$(var.ProductVersion)" Property="UPGRADEFOUND" IncludeMaximum="no" MigrateFeatures="yes" />
-      </Upgrade>
-      <CustomAction Id="PreventDowngrading" Error="!(loc.NewerVersionInstalled)" />
-
-      <InstallExecuteSequence>
-        <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
-        <RemoveExistingProducts After="InstallFinalize" />
-      </InstallExecuteSequence>
-      <InstallUISequence>
-        <Custom Action="PreventDowngrading" After="FindRelatedProducts">NEWPRODUCTFOUND</Custom>
-      </InstallUISequence>
-    -->
-
-    <!-- Define the directory structure -->
-    <Directory Id="TARGETDIR" Name="SourceDir">
-    <?if $(env.Platform)=x86?>
-        <Directory Id="ProgramFilesFolder">
-            <Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
-                <Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
-            </Directory>
-        </Directory>
-    <?elseif $(env.Platform)=x64?>
-        <Directory Id="ProgramFiles64Folder">
-            <Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
-                <Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
-            </Directory>
-         </Directory>
-    <?elseif $(env.Platform)=arm64?>
-        <Directory Id="ProgramFilesARMFolder" Name="Program Files (Arm)">
-            <Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
-                <Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
-            </Directory>
-         </Directory>
-    <?else?>
-        <!-- unknown arch > build must failed without directory-->
-    <?endif?>
-    </Directory>
-
-    <!--
-      RemoveFolderEx requires that we "remember" the path for uninstall.
-      This workaround is only required for the uninstall.
-    -->
-    <Property Id="INSTALLDIR_PER_MACHINE">
-      <RegistrySearch Id="INSTALLDIR_REGSEARCH_HKLM" Root="HKLM" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="Path" Type="raw" />
-    </Property>
-    <Property Id="INSTALLDIR_PER_USER">
-      <RegistrySearch Id="INSTALLDIR_REGSEARCH_HKCU" Root="HKCU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="Path" Type="raw" />
-    </Property>
-    
-    <CustomAction Id="PerMachineInstall" Property="TARGETDIR" Value="[INSTALLDIR_PER_MACHINE]" Execute="immediate"/>    
-    <CustomAction Id="PerUserInstall" Property="TARGETDIR" Value="[INSTALLDIR_PER_USER]" Execute="immediate"/>
-
-    <InstallExecuteSequence>
-        <Custom Action="PerMachineInstall" Before="CostFinalize">ALLUSERS=1  OR (ALLUSERS=2 AND Privileged)</Custom>
-        <Custom Action="PerUserInstall"    Before="CostFinalize">ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))</Custom>
-    </InstallExecuteSequence>
-
-    <!-- Add the shortcuts to your installer package -->
-    <DirectoryRef Id="INSTALLDIR">
-      <Component Id="CleanupMainInstallDir" Guid="*">
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="Path" Type="string" Value="[INSTALLDIR]" KeyPath="yes" />
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="Main" Type="integer" Value="1" />
-        <!-- We need to use INSTALLDIR variable here or RemoveFolderEx will not remove on "install". -->
-        <util:RemoveFolderEx On="uninstall" Property="INSTALLDIR" />
-        <RemoveFolder Id="PRODUCTMANUFACTURER_REMOVE" Directory="PRODUCTMANUFACTURER" On="uninstall" />
-      </Component>
-      <Component Id="AddToEnvironmentPath" Guid="*">
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="EnvironmentPath" Type="integer" Value="1" KeyPath="yes" />
-      </Component>
-      <Component Id="AddToEnvironmentPathSystem" Guid="*">
-        <Condition>ALLUSERS=1  OR (ALLUSERS=2 AND Privileged)</Condition>
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="EnvironmentPathSetForSystem" Type="integer" Value="1" KeyPath="yes" /> <!-- Only to get a Keypath and can use Guid="*" for having different guid for each installer -->
-        <Environment Id="PATH_SYSTEM" Name="PATH" Value="[INSTALLDIR]bin" Permanent="no" Part="first" Action="set" System="yes" />
-      </Component>
-      <Component Id="AddToEnvironmentPathUser" Guid="*">
-        <Condition>ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))</Condition>
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="EnvironmentPathSetForUser" Type="integer" Value="1" KeyPath="yes" /> <!-- Only to get a Keypath and can use Guid="*" for having different guid for each installer -->
-        <Environment Id="PATH_USER" Name="PATH" Value="[INSTALLDIR]bin" Permanent="no" Part="first" Action="set" System="no" />
-      </Component>
-      <Component Id="SetJavaHomeVariable" Guid="*">
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="JavaHome" Type="integer" Value="1" KeyPath="yes" />
-      </Component>
-      <Component Id="SetJavaHomeVariableSystem" Guid="*">
-        <Condition>ALLUSERS=1  OR (ALLUSERS=2 AND Privileged)</Condition>
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="JavaHomeSetForSystem" Type="integer" Value="1" KeyPath="yes" /> <!-- Only to get a Keypath and can use Guid="*" for having different guid for each installer -->
-        <Environment Id="JAVA_HOME_SYSTEM" Name="JAVA_HOME" Value="[INSTALLDIR]" Permanent="no" Action="set" System="yes" />
-      </Component>
-      <Component Id="SetJavaHomeVariableUser" Guid="*">
-        <Condition>ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))</Condition>
-        <RegistryValue Root="HKMU" Key="SOFTWARE\$(var.ProductManufacturer)\$(var.ProductCategory)\$(var.ProductVersion)\$(var.JVM)\MSI" Name="JavaHomeSetForUser" Type="integer" Value="1" KeyPath="yes" /> <!-- Only to get a Keypath and can use Guid="*" for having different guid for each installer -->
-        <Environment Id="JAVA_HOME_USER" Name="JAVA_HOME" Value="[INSTALLDIR]" Permanent="no" Action="set" System="no" />
-    </Component>
-      
-      <!-- Add jar launch by double click -->
-      <Component Id="SetJarFileRunWith" Guid="*">
-        <!--
-        https://support.microsoft.com/en-us/help/256986/windows-registry-information-for-advanced-users
-            If you write keys to a key under HKEY_CLASSES_ROOT, the system stores the information under HKEY_LOCAL_MACHINE\Software\Classes.
-            If you write values to a key under HKEY_CLASSES_ROOT, and the key already exists under HKEY_CURRENT_USER\Software\Classes, the system will store the information there instead of under HKEY_LOCAL_MACHINE\Software\Classes.
-
-        HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.jar\OpenWithProgids
-        is automatically created by Windows when running jar file for the first time
-        -->
-        <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\.jar" Type="string" Value="{vendor}.jarfile" KeyPath="yes" />
-        <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\.jar" Type="string" Name="Content Type" Value="application/java-archive" KeyPath="no" />
-
-        <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\{vendor}.jarfile\shell\open\command" Type="string" Value="&quot;[INSTALLDIR]bin\javaw.exe&quot; -jar &quot;%1&quot; %*" KeyPath="no" />
-      </Component>
-      <Component Id="SetOracleJavaSoftKeys" Guid="*">
-        <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]" Name="CurrentVersion" Type="string" Value="[ORACLE_VERSION_KEY]" KeyPath="yes" />
-        <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\[ORACLE_VERSION_KEY]" Name="JavaHome" Type="string" Value="[INSTALLDIR]" KeyPath="no" />
-        <?if $(env.PRODUCT_CATEGORY)="jre"?>
-            <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\[ORACLE_VERSION_KEY]" Name="RuntimeLib" Type="string" Value="[INSTALLDIR][DLL_PATH]" KeyPath="no" />
-            <!-- Oracle dont set RuntimeLib for JDK .. because JRE is "private" JRE so no ?else? -->
-        <?endif?>
-        <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\$(var.ProductVersion)" Name="JavaHome" Type="string" Value="[INSTALLDIR]" KeyPath="no" />
-        <?if $(env.PRODUCT_CATEGORY)="jre"?>
-            <RegistryValue Root="HKLM" Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]\$(var.ProductVersion)" Name="RuntimeLib" Type="string" Value="[INSTALLDIR][DLL_PATH]" KeyPath="no" />
-            <!-- Oracle don't set RuntimeLib for JDK .. because JRE is "private" JRE so no ?else? -->
-        <?endif?>
-      </Component>
-      <!-- Add jnlp launch by double click -->
-      <?if $(env.Platform)=x64?>
-        <?if $(env.PRODUCT_MAJOR_VERSION)=8?>
-          <?if $(env.BUNDLE_ICEDTEAWEB)=true?>
-            <Component Id="SetJNLPFileRunWith" Guid="*">
-              <!--
-              https://support.microsoft.com/en-us/help/256986/windows-registry-information-for-advanced-users
-                  If you write keys to a key under HKEY_CLASSES_ROOT, the system stores the information under HKEY_LOCAL_MACHINE\Software\Classes.
-                  If you write values to a key under HKEY_CLASSES_ROOT, and the key already exists under HKEY_CURRENT_USER\Software\Classes, the system will store the information there instead of under HKEY_LOCAL_MACHINE\Software\Classes.
-
-              HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.jnlp\OpenWithProgids
-              is automatically created by Windows when running jnlp file for the first time
-              -->
-              <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\.jnlp" Type="string" Value="{vendor}.jnlpfile" KeyPath="yes" />
-              <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\.jnlp" Type="string" Name="Content Type" Value="application/jnlp" KeyPath="no" />
-
-              <RegistryValue Root="HKMU" Key="SOFTWARE\Classes\{vendor}.jnlpfile\shell\open\command" Type="string" Value="&quot;[INSTALLDIR]bin\javaws.exe&quot; -jnlp &quot;%1&quot; %*" KeyPath="no" />
-            </Component>
-          <?endif?>
-        <?endif?>
-      <?endif?>
-    </DirectoryRef>
-
-    <Property Id="JAVASOFT_CURRENTVERSION">
-        <RegistrySearch Id="JAVASOFT_CURRENTVERSION"
-                        Root="HKLM"
-                        Key="SOFTWARE\JavaSoft\[ORACLE_JAVASOFT_BASE_KEY]"
-                        Name="CurrentVersion"
-                        Type="raw" />
-    </Property>
-     
-    <!-- List of features to install -->
-    <Feature Id="FeatureMain" ConfigurableDirectory="INSTALLDIR" Level="1" Title="$(var.FeatureMainName)" Description="$(var.FeatureMainDescription)" Absent="disallow" Display="expand" AllowAdvertise="no" InstallDefault="local">
-      <ComponentRef Id="CleanupMainInstallDir" />
-      <ComponentGroupRef Id="AppFiles" />
-        <Feature Id="FeatureEnvironment" Level="1" Title="!(loc.FeatureEnvironmentTitle)" Description="!(loc.FeatureEnvironmentDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent">
-          <ComponentRef Id="AddToEnvironmentPath" />
-          <ComponentRef Id="AddToEnvironmentPathSystem" />
-          <ComponentRef Id="AddToEnvironmentPathUser" />
-        </Feature>
-        <Feature Id="FeatureJarFileRunWith" Level="1" Title="!(loc.FeatureJarFileRunWithTitle)" Description="!(loc.FeatureJarFileRunWithDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent">
-          <ComponentRef Id="SetJarFileRunWith" />
-        </Feature>
-      <Feature Id="FeatureJavaHome" Level="2" Title="!(loc.FeatureJavaHomeTitle)" Description="!(loc.FeatureJavaHomeDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent">
-        <ComponentRef Id="SetJavaHomeVariable" />
-        <ComponentRef Id="SetJavaHomeVariableSystem" />
-        <ComponentRef Id="SetJavaHomeVariableUser" />
-      </Feature>
-
-      <Feature Id="FeatureOracleJavaSoft" Level="2" Title="!(loc.FeatureOracleJavaSoftName)" Description="!(loc.FeatureOracleJavaSoftDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent" >
-        <!-- See https://docs.oracle.com/javase/9/install/installation-jdk-and-jre-microsoft-windows-platforms.htm#JSJIG-GUID-47C269A3-5220-412F-9E31-4B8C37A82BFB -->
-        <!-- As Oracle, don't override if current value is already bigger ( newer java ): "a value that is the highest installed version on the system" 
-        Note !! : the reg key is not removed during uninstall if any other installer reference it
-        -->
-        <Condition Level="0"><![CDATA[JAVASOFT_CURRENTVERSION <> "1.8" AND JAVASOFT_CURRENTVERSION > $(var.ProductMajorVersion)]]></Condition>
-        <ComponentRef Id="SetOracleJavaSoftKeys" />
-      </Feature>
-      <?if $(env.Platform)=x64?>
-        <?if $(env.PRODUCT_MAJOR_VERSION)=8?>
-          <?if $(env.BUNDLE_ICEDTEAWEB)=true?>
-            <Feature Id="FeatureIcedTeaWeb" ConfigurableDirectory="INSTALLDIR" Level="2" Title="!(loc.FeatureIcedTeaWebTitle)" Description="!(loc.FeatureIcedTeaWebDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="local">
-              <ComponentGroupRef Id="IcedTeaWebFiles" />
-              <Feature Id="FeatureJNLPFileRunWith" Level="3" Title="!(loc.FeatureJNLPFileRunWithTitle)" Description="!(loc.FeatureJNLPFileRunWithDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="followParent">
-                <ComponentRef Id="SetJNLPFileRunWith" />
-              </Feature>
-            </Feature>
-          <?endif?>
-        <?endif?>
-      <?endif?>
-    </Feature>
-    <!-- <Feature Id="FeatureSource" ConfigurableDirectory="INSTALLDIR" Level="1" Title="!(loc.FeatureSourceTitle)" Description="!(loc.FeatureSourceDescription)" Absent="allow" AllowAdvertise="no" InstallDefault="local">
-      <ComponentGroupRef Id="SrcFiles" />
-    </Feature> -->
-
-    <WixVariable Id="WixUILicenseRtf" Value="$(var.SetupResourcesDir)\license-OpenJ9.en-us.rtf" />
-    <WixVariable Id="WixUIDialogBmp" Value="{vendor_branding_dialog}" />
-    <WixVariable Id="WixUIBannerBmp" Value="{vendor_branding_banner}" />
-    <UI>
-      <UIRef Id="WixUI_FeatureTree" />
-    </UI>
-  </Product>
-</Wix>
diff --git a/wix/Main.hotspot.wxs.template b/wix/Main.wxs.template
similarity index 99%
rename from wix/Main.hotspot.wxs.template
rename to wix/Main.wxs.template
index 0ee6a8bdb..96bd2ebb7 100644
--- a/wix/Main.hotspot.wxs.template
+++ b/wix/Main.wxs.template
@@ -222,7 +222,7 @@
       <ComponentGroupRef Id="SrcFiles" />
     </Feature> -->
 
-    <WixVariable Id="WixUILicenseRtf" Value="$(var.SetupResourcesDir)\license-GPLv2+CE.en-us.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.SetupResourcesDir)\$(var.license)" />
     <WixVariable Id="WixUIDialogBmp" Value="{vendor_branding_dialog}" />
     <WixVariable Id="WixUIBannerBmp" Value="{vendor_branding_banner}" />
     <UI>