adoptium · douph1 · May 17, 2021 · Apr 15, 2021 · Apr 15, 2021 · Apr 15, 2021
diff --git a/.github/workflows/wix.yml b/.github/workflows/wix.yml
@@ -10,31 +10,53 @@ jobs:
   pkgbuild:
     strategy:
       matrix:
-        ICEDTEA_WEB_VERSION:
-          - "icedtea-web-1.8.6"
-          - ""
+        jdk: [8, 11]
+        include:
+        - jdk: 8
+          ICEDTEA_WEB_VERSION: "icedtea-web-1.8.6"
+          PRODUCT_MAJOR_VERSION: 8
+          PRODUCT_MINOR_VERSION: 0
+          PRODUCT_MAINTENANCE_VERSION: 265
+          PRODUCT_PATCH_VERSION: 0
+          PRODUCT_BUILD_NUMBER: "01"
+          MSI_PRODUCT_VERSION: 8.0.265.1
+          ARCH: x64
+          TAG: jdk8u265-b01
+          SUB_TAG: 8u265b01
+          JVM: hotspot
+        - jdk: 11
+          ICEDTEA_WEB_VERSION: ""
+          PRODUCT_MAJOR_VERSION: 11
+          PRODUCT_MINOR_VERSION: 0
+          PRODUCT_MAINTENANCE_VERSION: 9
+          PRODUCT_PATCH_VERSION: 1
+          PRODUCT_BUILD_NUMBER: 11
+          MSI_PRODUCT_VERSION: 11.0.9.1
+          ARCH: x64
+          TAG: jdk-11.0.9+11.1
+          SUB_TAG: 11.0.9_11
+          JVM: hotspot
+
     name: wix
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
 
       - name: Install dependencies
         run: |
-          choco install wget
+          choco install --no-progress wget
 
       - name: Setup environment variables
         uses: allenevans/set-env@v2.0.0
         with:
-          PRODUCT_MAJOR_VERSION: 8
-          PRODUCT_MINOR_VERSION: 0
-          PRODUCT_MAINTENANCE_VERSION: 265
-          PRODUCT_PATCH_VERSION: 0
-          PRODUCT_BUILD_NUMBER: "01"
-          MSI_PRODUCT_VERSION: 8.0.265.1
-          ARCH: x64
-          TAG: jdk8u265-b01
-          SUB_TAG: 8u265b01
-          JVM: hotspot
+          PRODUCT_MAJOR_VERSION: ${{ matrix.PRODUCT_MAJOR_VERSION }}
+          PRODUCT_MINOR_VERSION: ${{ matrix.PRODUCT_MINOR_VERSION }}
+          PRODUCT_MAINTENANCE_VERSION: ${{ matrix.PRODUCT_MAINTENANCE_VERSION }}
+          PRODUCT_PATCH_VERSION: ${{ matrix.PRODUCT_PATCH_VERSION }}
+          PRODUCT_BUILD_NUMBER: ${{ matrix.PRODUCT_BUILD_NUMBER }}
+          MSI_PRODUCT_VERSION: ${{ matrix.MSI_PRODUCT_VERSION }}
+          ARCH: ${{ matrix.ARCH }}
+          JVM: ${{ matrix.JVM }}
 
       - name: Download IcedTea-Web
         run: |
@@ -48,8 +70,8 @@ jobs:
       - name: Download Prebuilt JDK/JRE
         run: |
           cd wix\SourceDir
-          wget -q "https://github.com/AdoptOpenJDK/openjdk${{ env.PRODUCT_MAJOR_VERSION }}-binaries/releases/download/${{ env.TAG }}/OpenJDK${{ env.PRODUCT_MAJOR_VERSION }}U-jdk_${{ env.ARCH }}_windows_${{ env.JVM }}_${{ env.SUB_TAG }}.zip"
-          wget -q "https://github.com/AdoptOpenJDK/openjdk${{ env.PRODUCT_MAJOR_VERSION }}-binaries/releases/download/${{ env.TAG }}/OpenJDK${{ env.PRODUCT_MAJOR_VERSION }}U-jre_${{ env.ARCH }}_windows_${{ env.JVM }}_${{ env.SUB_TAG }}.zip"
+          wget -q "https://github.com/AdoptOpenJDK/openjdk${{ env.PRODUCT_MAJOR_VERSION }}-binaries/releases/download/${{ matrix.TAG }}/OpenJDK${{ env.PRODUCT_MAJOR_VERSION }}U-jdk_${{ env.ARCH }}_windows_${{ env.JVM }}_${{ matrix.SUB_TAG }}.zip"
+          wget -q "https://github.com/AdoptOpenJDK/openjdk${{ env.PRODUCT_MAJOR_VERSION }}-binaries/releases/download/${{ matrix.TAG }}/OpenJDK${{ env.PRODUCT_MAJOR_VERSION }}U-jre_${{ env.ARCH }}_windows_${{ env.JVM }}_${{ matrix.SUB_TAG }}.zip"
           ./CreateSourceFolder.AdoptOpenJDK.ps1
 
       - name: Create JDK Installer

diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ Thumbs.db
 *.iml
 
 node_modules/
+wix/Workdir/
diff --git a/wix/Build.OpenJDK_generic.cmd b/wix/Build.OpenJDK_generic.cmd
@@ -99,16 +99,8 @@ REM Configure available SDK version:
 REM See folder e.g. "C:\Program Files (x86)\Windows Kits\[10]\bin\[10.0.16299.0]\x64"
 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
+SET WORKDIR=Workdir\
+mkdir %WORKDIR%
 
 REM
 REM Nothing below this line need to be changed normally.
@@ -180,6 +172,19 @@ 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, *.Base.*.wxl.template *.!JVM!.*.wxl.template,*.wxs.template') DO (
+        SET INPUT_FILE=%%~ni
+        REM Prevent concurrency issues if multiple builds are running in parallel.
+        SET OUTPUT_FILE=%WORKDIR%!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!"
+	IF ERRORLEVEL 1 (
+	    ECHO Unable to make string replacement
+	    GOTO FAILED
+	)
+    )
+
     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 +215,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!
@@ -239,7 +241,7 @@ FOR %%A IN (%ARCH%) DO (
                 ECHO IcedTeaWeb Directory Exist!
                 SET BUNDLE_ICEDTEAWEB=true
                 SET ITW_WXS="IcedTeaWeb-!OUTPUT_BASE_FILENAME!.wxs"
-                SET ITW_WIXOBJ="IcedTeaWeb-!OUTPUT_BASE_FILENAME!.wixobj"
+                SET ITW_WIXOBJ=%WORKDIR%IcedTeaWeb-!OUTPUT_BASE_FILENAME!.wixobj
                 ECHO HEAT
                 "!WIX!bin\heat.exe" dir "!ICEDTEAWEB_DIR!" -out !ITW_WXS! -t "!SETUP_RESOURCES_DIR!\heat.icedteaweb.xslt" -gg -sfrag -scom -sreg -srd -ke -cg "IcedTeaWebFiles" -var var.IcedTeaWebDir -dr INSTALLDIR -platform !PLATFORM!
                 IF ERRORLEVEL 1 (
@@ -254,7 +256,7 @@ FOR %%A IN (%ARCH%) DO (
 
     ECHO HEAT
     @ECHO ON
-    "!WIX!bin\heat.exe" dir "!REPRO_DIR!" -out Files-!OUTPUT_BASE_FILENAME!.wxs -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!
+    "!WIX!bin\heat.exe" dir "!REPRO_DIR!" -out %WORKDIR%!OUTPUT_BASE_FILENAME!-Files.wxs -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!
     IF ERRORLEVEL 1 (
         ECHO Failed to generating Windows Installer XML Source files ^(.wxs^)
         GOTO FAILED
@@ -263,18 +265,20 @@ 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! -out %WORKDIR% %WORKDIR%!OUTPUT_BASE_FILENAME!-Main.wxs %WORKDIR%!OUTPUT_BASE_FILENAME!-Files.wxs !ITW_WXS! -ext WixUIExtension -ext WixUtilExtension -dIcedTeaWebDir="!ICEDTEAWEB_DIR!" -dOutputBaseFilename="!OUTPUT_BASE_FILENAME!" -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^)
+        dir /s /b /o:n %WORKDIR%
         GOTO FAILED
     )
     @ECHO OFF
 
     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" %WORKDIR%!OUTPUT_BASE_FILENAME!-Main.wixobj %WORKDIR%!OUTPUT_BASE_FILENAME!-Files.wixobj !ITW_WIXOBJ! !MSI_VALIDATION_OPTION! -cc !CACHE_FOLDER! -ext WixUIExtension -ext WixUtilExtension -spdb -out "ReleaseDir\!OUTPUT_BASE_FILENAME!.msi" -loc "%WORKDIR%!OUTPUT_BASE_FILENAME!-!PRODUCT_SKU!.Base.!CULTURE!.wxl" -loc "%WORKDIR%!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^)
+        dir /s /b /o:n
         GOTO FAILED
     )
     @ECHO OFF
@@ -350,10 +354,13 @@ FOR %%A IN (%ARCH%) DO (
     echo sign.bat exit code is 0. There were %timestampErrors% timestamping errors.
 
     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 "Main-!OUTPUT_BASE_FILENAME!.wixobj"
+    DEL "%WORKDIR%!OUTPUT_BASE_FILENAME!-Files.wxs"
+    DEL "%WORKDIR%!OUTPUT_BASE_FILENAME!-Files.wixobj"
+    DEL "%WORKDIR%!OUTPUT_BASE_FILENAME!-Main.wxs"
+    DEL "%WORKDIR%!OUTPUT_BASE_FILENAME!-Main.wixobj"
+    DEL "%WORKDIR%!OUTPUT_BASE_FILENAME!-!PRODUCT_SKU!.%JVM%.*.wxl"
+    DEL "%WORKDIR%!OUTPUT_BASE_FILENAME!-!PRODUCT_SKU!.Base.*.wxl"
+    DEL "%WORKDIR%!OUTPUT_BASE_FILENAME!-!PRODUCT_SKU!.Variables.wxi"
     IF DEFINED ITW_WXS (
         DEL !ITW_WXS!
         DEL !ITW_WIXOBJ!

diff --git a/wix/BuildSetupTranslationTransform.cmd b/wix/BuildSetupTranslationTransform.cmd
@@ -16,7 +16,7 @@ REM Build with extra Source Code feature (needs work)
 REM IF EXIST Files-!OUTPUT_BASE_FILENAME!.wixobj "%WIX%bin\light.exe" !MSI_VALIDATION_OPTION! Main-!OUTPUT_BASE_FILENAME!.wixobj Files-!OUTPUT_BASE_FILENAME!.wixobj Src-!OUTPUT_BASE_FILENAME!.wixobj !ITW_WIXOBJ! -cc !CACHE_FOLDER! -reusecab -ext WixUIExtension -ext WixUtilExtension -spdb -out "ReleaseDir\!OUTPUT_BASE_FILENAME!.!CULTURE!.msi" -loc "Lang\%PRODUCT_SKU%.Base.!CULTURE!.wxl" -loc "Lang\%PRODUCT_SKU%.!PACKAGE_TYPE!.!CULTURE!.wxl" -cultures:!CULTURE!
 
 REM Build without extra Source Code feature
-IF EXIST Files-!OUTPUT_BASE_FILENAME!.wixobj "%WIX%bin\light.exe" !MSI_VALIDATION_OPTION! Main-!OUTPUT_BASE_FILENAME!.wixobj Files-!OUTPUT_BASE_FILENAME!.wixobj !ITW_WIXOBJ! -cc !CACHE_FOLDER! -reusecab -ext WixUIExtension -ext WixUtilExtension -spdb -out "ReleaseDir\!OUTPUT_BASE_FILENAME!.!CULTURE!.msi" -loc "Lang\%PRODUCT_SKU%.Base.!CULTURE!.wxl" -loc "Lang\%PRODUCT_SKU%.!PACKAGE_TYPE!.!CULTURE!.wxl" -cultures:!CULTURE!
+IF EXIST Workdir\!OUTPUT_BASE_FILENAME!-Files.wixobj "%WIX%bin\light.exe" !MSI_VALIDATION_OPTION! Workdir\!OUTPUT_BASE_FILENAME!-Main.wixobj Workdir\!OUTPUT_BASE_FILENAME!-Files.wixobj !ITW_WIXOBJ! -cc !CACHE_FOLDER! -reusecab -ext WixUIExtension -ext WixUtilExtension -spdb -out "ReleaseDir\!OUTPUT_BASE_FILENAME!.!CULTURE!.msi" -loc "Workdir\!OUTPUT_BASE_FILENAME!-%PRODUCT_SKU%.Base.!CULTURE!.wxl" -loc "Workdir\!OUTPUT_BASE_FILENAME!-%PRODUCT_SKU%.!PACKAGE_TYPE!.!CULTURE!.wxl" -cultures:!CULTURE!
 IF ERRORLEVEL 1 (
     ECHO light failed with : %ERRORLEVEL%
     GOTO FAILED

diff --git a/wix/Includes/OpenJDK.Variables.wxi.template b/wix/Includes/OpenJDK.Variables.wxi.template
@@ -56,23 +56,40 @@
     <?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 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" ?>
+  <?else?>
+    <?define license="no licence defined for $(var.JVM)" ?>
+    <?define license_shown="1" ?>
+  <?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?>
+          <!-- Prefer 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! -->