Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated msi windows installers to use wix v5 #851

Merged
merged 72 commits into from
May 9, 2024
Merged

Updated msi windows installers to use wix v5 #851

Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
0dc7ad5
First attempt at converting wix/Build.OpenJDK_generic.cmd to .ps1 file
jmjaffe37 Mar 11, 2024
3dd44ad
Updated main + base + hotspot wix xml templates
jmjaffe37 Mar 11, 2024
3fe7cbd
Updated dragonwell + openj9 wix templates to wixv4
jmjaffe37 Mar 11, 2024
3fc05bb
Updated remaining templates to wix v4
jmjaffe37 Mar 12, 2024
c2fce74
Updated extensions used in wix commands
jmjaffe37 Mar 12, 2024
af7f7ea
First attempt at converting to wixv4
jmjaffe37 Mar 12, 2024
b0d976b
No attempting to use wix_heat_directory
jmjaffe37 Apr 3, 2024
93cde4d
Now using wix 4.0.5
jmjaffe37 Apr 3, 2024
3ba44b5
Now placing heat.exe in Resources dir
jmjaffe37 Apr 4, 2024
f678094
updated default heat path and error messages
jmjaffe37 Apr 4, 2024
a818e88
Now adding wix extensions
jmjaffe37 Apr 4, 2024
eed8bf1
Now keeping all heat tools files
jmjaffe37 Apr 4, 2024
64c1c3b
updated default heat path, fixed error message
jmjaffe37 Apr 4, 2024
f35ec13
Removed 'ALLUSERS' property from Main.wxs.template; causing 'duplicat…
jmjaffe37 Apr 4, 2024
3e50487
Changed ID ALLUSERS to ALLUSERSSETUP
jmjaffe37 Apr 4, 2024
3ff5cd5
Updated culture translation
jmjaffe37 Apr 4, 2024
2ea3ec6
Added + updated error messages
jmjaffe37 Apr 4, 2024
d9d4a0a
Updated error message
jmjaffe37 Apr 4, 2024
ac2c8ea
Updated comments and wix.yml
jmjaffe37 Apr 4, 2024
b138ed5
Deleted Build-OpenJDK.ps1
jmjaffe37 Apr 4, 2024
93da458
Attempting to support icedTea again
jmjaffe37 Apr 4, 2024
491580c
now heating jdk8 on single line
jmjaffe37 Apr 4, 2024
2f363ab
Attempting to build with IcedTea
jmjaffe37 Apr 9, 2024
d6c7ac4
Added comments and updated error messages
jmjaffe37 Apr 10, 2024
b5e3123
Added back -sfrag flag and added comments
jmjaffe37 Apr 10, 2024
c055f90
Updated installer version from 200 to 500 to get rid of warning
jmjaffe37 Apr 10, 2024
54c93ab
Updated old source code comments
jmjaffe37 Apr 10, 2024
784c8de
Updated wix/README.md
jmjaffe37 Apr 10, 2024
3c91bde
Seperated heat and build commands out for readability. Now there is 1…
jmjaffe37 Apr 10, 2024
e0d2273
Updated debug and error messages
jmjaffe37 Apr 10, 2024
960e7df
Fixed typo
jmjaffe37 Apr 10, 2024
5af48b9
Now using wix v5 by default
jmjaffe37 Apr 10, 2024
07b7ed9
Added ability for custom output file names
jmjaffe37 Apr 16, 2024
352bf89
Removed old comments
jmjaffe37 Apr 18, 2024
351d7f7
Merge branch 'master' into jmj/wix4_update
jmjaffe37 Apr 19, 2024
d0136da
applied feedback from code review
jmjaffe37 Apr 22, 2024
ad44594
Added xml tagging back
jmjaffe37 Apr 22, 2024
2c000cb
Updated README.md
jmjaffe37 Apr 22, 2024
791cb72
Fixed 'ALLUSERS' property
jmjaffe37 Apr 22, 2024
293dee6
Fixed typo
jmjaffe37 Apr 22, 2024
814a501
Updated wxs spacing and added a comment
jmjaffe37 Apr 22, 2024
7e5c691
Updated README.md with new URL and more md style
jmjaffe37 Apr 23, 2024
9791b53
More md style number bullets
jmjaffe37 Apr 23, 2024
1602161
Added other necessary env vars to README.md
jmjaffe37 Apr 23, 2024
5d1ffd9
Fixed README.md typos
jmjaffe37 Apr 23, 2024
bcc4707
Merge branch 'master' into jmj/wix4_update
gdams Apr 24, 2024
4510eae
Testing changes to fix default installdir
jmjaffe37 Apr 24, 2024
a96f095
Now able to set installation scope
jmjaffe37 Apr 24, 2024
f7ca8d5
Updated comments
jmjaffe37 Apr 24, 2024
18ec3e1
support perUser and perMachine
gdams Apr 30, 2024
0698685
Merge branch 'master' into jmj/wix4_update
gdams Apr 30, 2024
e6bb06a
formatting tweaks
gdams Apr 30, 2024
6f6a569
use API to fetch versions to build
gdams Apr 30, 2024
311d9ea
remove PerUserOrMachine-Example
gdams Apr 30, 2024
ab6da46
Merge branch 'master' into jmj/wix4_update
gdams Apr 30, 2024
434a247
Re-added ability for vendor to choose not to show the end-user licens…
jmjaffe37 Apr 30, 2024
a03a907
Fixed back button
jmjaffe37 Apr 30, 2024
19a400b
Test
jmjaffe37 Apr 30, 2024
40c4f7e
Now installing wix quietly
jmjaffe37 Apr 30, 2024
8243553
Now using format closer to what existed previously
jmjaffe37 Apr 30, 2024
c57f896
Removed test code
jmjaffe37 Apr 30, 2024
6149aef
Added sample code and comment
jmjaffe37 Apr 30, 2024
eb0b678
Added license end-user license behavior section to README.md
jmjaffe37 Apr 30, 2024
ccab40c
Now using env var for vendor
jmjaffe37 May 1, 2024
0507767
Took out vendor logic for end-user license agreements (as requested),…
jmjaffe37 May 1, 2024
375429d
Updated wix installer changelog.md
jmjaffe37 May 2, 2024
00f04bb
Fixed formatting
jmjaffe37 May 2, 2024
1bcb898
Update .github/workflows/wix.yml
gdams May 3, 2024
bd16b79
Updated README.md minimum supported wix version
jmjaffe37 May 3, 2024
35d0e69
formatting tweak
jmjaffe37 May 3, 2024
6d8c0b3
Merge branch 'master' into jmj/wix4_update
jmjaffe37 May 3, 2024
9dd8b96
Merge branch 'master' into jmj/wix4_update
jmjaffe37 May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 62 additions & 62 deletions wix/Main.wxs.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,51 +178,51 @@
Key="SOFTWARE\JavaSoft\$(var.OracleJavasoftBaseKey)\$(var.OracleVersionKey)"
Name="JavaHome" Type="string" Value="[INSTALLDIR]" KeyPath="yes" />
<?if $(env.PRODUCT_CATEGORY)="jre"?>
<RegistryValue Root="HKLM"
Key="SOFTWARE\JavaSoft\$(var.OracleJavasoftBaseKey)\$(var.OracleVersionKey)"
Name="RuntimeLib" Type="string" Value="[INSTALLDIR]$(var.DllPath)" KeyPath="no" />
<!-- Oracle dont set RuntimeLib for JDK .. because JRE is "private" JRE so no ?else? -->
<RegistryValue Root="HKLM"
Key="SOFTWARE\JavaSoft\$(var.OracleJavasoftBaseKey)\$(var.OracleVersionKey)"
Name="RuntimeLib" Type="string" Value="[INSTALLDIR]$(var.DllPath)" KeyPath="no" />
<!-- Oracle doesn't set RuntimeLib for JDK .. because JRE is "private" JRE so no ?else? -->
<?endif?>
<RegistryValue Root="HKLM"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whitespace for this doesn't match your change above?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@karianna I am unsure which section you are referring to about the whitespace mismatch. I will say, some of the whitespace tweaks were done by @gdams, but I wanted to change back the inner blocks of if-statements to be indented so the reader is more clear on which lines fall within the if-statement block

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmjaffe37 feel free to tweak them to however you prefer

Key="SOFTWARE\JavaSoft\$(var.OracleJavasoftBaseKey)\$(var.ProductVersion)" Name="JavaHome"
Type="string" Value="[INSTALLDIR]" KeyPath="no" />
<?if $(env.PRODUCT_CATEGORY)="jre"?>
<RegistryValue Root="HKLM"
Key="SOFTWARE\JavaSoft\$(var.OracleJavasoftBaseKey)\$(var.ProductVersion)"
Name="RuntimeLib" Type="string" Value="[INSTALLDIR]$(var.DllPath)" KeyPath="no" />
<!-- Oracle don't set RuntimeLib for JDK .. because JRE is "private" JRE so no ?else? -->
<RegistryValue Root="HKLM"
Key="SOFTWARE\JavaSoft\$(var.OracleJavasoftBaseKey)\$(var.ProductVersion)"
Name="RuntimeLib" Type="string" Value="[INSTALLDIR]$(var.DllPath)" 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">
<!--
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.
<?if $(env.PRODUCT_MAJOR_VERSION)=8?>
<?if $(env.BUNDLE_ICEDTEAWEB)=true?>
<Component Id="SetJNLPFileRunWith">
<!--
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" />
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" />
<RegistryValue Root="HKLM"
Key="SOFTWARE\Classes\MIME\Database\Content Type\application/x-java-jnlp-file"
Type="string" Name="Extension" Value=".jnlp" KeyPath="no" />
</Component>
<?endif?>
<?endif?>
<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" />
<RegistryValue Root="HKLM"
Key="SOFTWARE\Classes\MIME\Database\Content Type\application/x-java-jnlp-file"
Type="string" Name="Extension" Value=".jnlp" KeyPath="no" />
</Component>
<?endif?>
<?endif?>
<?endif?>
</DirectoryRef>

Expand Down Expand Up @@ -270,20 +270,20 @@
<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)"
AllowAdvertise="no" InstallDefault="local">
<ComponentGroupRef Id="IcedTeaWebFiles" />
<Feature Id="FeatureJNLPFileRunWith" Level="3" Title="!(loc.FeatureJNLPFileRunWithTitle)"
Description="!(loc.FeatureJNLPFileRunWithDescription)" AllowAdvertise="no"
InstallDefault="followParent">
<ComponentRef Id="SetJNLPFileRunWith" />
</Feature>
</Feature>
<?endif?>
<?endif?>
<?if $(env.PRODUCT_MAJOR_VERSION)=8?>
<?if $(env.BUNDLE_ICEDTEAWEB)=true?>
<Feature Id="FeatureIcedTeaWeb" ConfigurableDirectory="INSTALLDIR" Level="2"
Title="!(loc.FeatureIcedTeaWebTitle)" Description="!(loc.FeatureIcedTeaWebDescription)"
AllowAdvertise="no" InstallDefault="local">
<ComponentGroupRef Id="IcedTeaWebFiles" />
<Feature Id="FeatureJNLPFileRunWith" Level="3" Title="!(loc.FeatureJNLPFileRunWithTitle)"
Description="!(loc.FeatureJNLPFileRunWithDescription)" AllowAdvertise="no"
InstallDefault="followParent">
<ComponentRef Id="SetJNLPFileRunWith" />
</Feature>
</Feature>
<?endif?>
<?endif?>
<?endif?>
</Feature>
<!-- <Feature Id="FeatureSource" ConfigurableDirectory="INSTALLDIR" Level="1"
Expand Down Expand Up @@ -363,23 +363,23 @@
</UI>
<!-- Define the directory structure -->
<?if $(env.Platform)=x86?>
<StandardDirectory Id="ProgramFilesFolder">
<Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
<Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
</Directory>
</StandardDirectory>
<StandardDirectory Id="ProgramFilesFolder">
<Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
<Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
</Directory>
</StandardDirectory>
<?elseif $(env.Platform)=x64?>
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
<Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
</Directory>
</StandardDirectory>
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
<Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
</Directory>
</StandardDirectory>
<?elseif $(env.Platform)=arm64?>
<Directory Id="ProgramFiles64Folder"> <!-- ARM64 is 64bit -->
<Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
<Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
<Directory Id="ProgramFiles64Folder"> <!-- ARM64 is 64bit -->
<Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
<Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
</Directory>
</Directory>
</Directory>
<?else?>
<!-- unknown arch > build must failed without directory-->
<?endif?>
Expand Down