Skip to content

Commit bd6820b

Browse files
committed
WiX: permit building the installer for ARM64
Windows ARM64 support is slowly being bootstrapped, enable the ARM64 installer which differs only in the upgrade code and the architecture name.
1 parent 5add3f2 commit bd6820b

File tree

3 files changed

+29
-1
lines changed

3 files changed

+29
-1
lines changed

platforms/Windows/installer-arm64.wxs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2+
<Bundle Name="Swift Developer Package for Windows aarch64" Version="$(var.ProductVersion)" Manufacturer="swift.org" UpgradeCode="151d42d9-8877-4b72-ac62-4695243a35c1">
3+
<BootstrapperApplication>
4+
<bal:WixStandardBootstrapperApplication LicenseUrl="" LogoFile="Resources/swift.png" SuppressOptionsUI="yes" SuppressRepair="no" Theme="hyperlinkLicense" />
5+
</BootstrapperApplication>
6+
7+
<Chain>
8+
<?if $(var.RequiredChain) != "" ?>
9+
<?foreach MSI in $(var.RequiredChain) ?>
10+
<MsiPackage SourceFile="$(var.MSI_LOCATION)\$(var.MSI)" Compressed="yes">
11+
<MsiProperty Name="INSTALL_DEBUGINFO" Value="[INSTALL_DEBUGINFO]" />
12+
</MsiPackage>
13+
<?endforeach?>
14+
<?endif?>
15+
16+
<?if $(var.OptionalChain) != "" ?>
17+
<?foreach MSI in $(var.OptionalChain) ?>
18+
<MsiPackage SourceFile="$(var.MSI_LOCATION)\$(var.MSI)" Compressed="yes" Visible="yes">
19+
<MsiProperty Name="INSTALL_DEBUGINFO" Value="[INSTALL_DEBUGINFO]" />
20+
</MsiPackage>
21+
<?endforeach?>
22+
<?endif?>
23+
</Chain>
24+
</Bundle>
25+
</Wix>

platforms/Windows/installer.wixproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
</PropertyGroup>
66

77
<PropertyGroup>
8+
<ProductArchitecture Condition=" '$(ProductArchitecture)' == '' ">amd64</ProductArchitecture>
9+
<ProductArchitecture>$(ProductArchitecture)</ProductArchitecture>
10+
811
<ProductVersion Condition=" '$(ProductVersion)' == '' ">0.0.0</ProductVersion>
912
<ProductVersion>$(ProductVersion)</ProductVersion>
1013

@@ -31,6 +34,6 @@
3134
</ItemGroup>
3235

3336
<ItemGroup>
34-
<Compile Include="installer.wxs" />
37+
<Compile Include="installer-$(ProductArchitecture).wxs" />
3538
</ItemGroup>
3639
</Project>

0 commit comments

Comments
 (0)