Skip to content

Commit 18dadb1

Browse files
committed
WiX: prepare the toolchain MSIs for ARM64
Introduce the ability to have more than one architecture for the devtools and toolchain components. This is in preparation for introducing the ability to package up the toolchain for the ARM64 host.
1 parent e3c754b commit 18dadb1

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed
File renamed without changes.

platforms/Windows/devtools.wixproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11+
<ProductArchitecture Condition=" '$(ProductArchitecture)' == '' ">amd64</ProductArchitecture>
12+
<ProductArchitecture>$(ProductArchitecture)</ProductArchitecture>
13+
1114
<ProductVersion Condition=" '$(ProductVersion)' == '' ">0.0.0</ProductVersion>
1215
<ProductVersion>0.0.0</ProductVersion>
1316
</PropertyGroup>
@@ -36,6 +39,6 @@
3639
</PropertyGroup>
3740

3841
<ItemGroup>
39-
<Compile Include="devtools.wxs" />
42+
<Compile Include="devtools-$(ProductArchitecture).wxs" />
4043
</ItemGroup>
4144
</Project>

platforms/Windows/toolchain.wixproj

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<OutputType>Package</OutputType>
66
<ProjectGuid>6ebfb883-fc92-4b73-81ae-ddeb2cec4df9</ProjectGuid>
77
<SchemaVersion>2.0</SchemaVersion>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<ProductArchitecture Condition=" '$(ProductArchitecture)' == '' ">amd64</ProductArchitecture>
12+
<ProductArchitecture>$(ProductArchitecture)</ProductArchitecture>
13+
814
<ProductVersion Condition=" '$(ProductVersion)' == '' ">0.0.0</ProductVersion>
915
<ProductVersion>$(ProductVersion)</ProductVersion>
1016
</PropertyGroup>
@@ -49,6 +55,6 @@
4955
</Target>
5056

5157
<ItemGroup>
52-
<Compile Include="toolchain.wxs" />
58+
<Compile Include="toolchain-$(ProductArchitecture).wxs" />
5359
</ItemGroup>
5460
</Project>

0 commit comments

Comments
 (0)