Skip to content

Commit 396c15d

Browse files
compnerdcompnerd
committed
WiX: restructure the Windows installer
This restructures the Windows installer components to the following: - bld - cli - dbg - ide - rtl The SDKs for the various platforms have now been removed and replaced with the new platforms packages. There are currently two of them: - android - windows Each one of these platform support packages support a set of architectures relevant to the OS. The platform MSI installs the shared view of the platform support, and each architecture slice adds the support for the specified architecture. The parameters to the installer build have now been replaced with the single root path to the toolchain image and a set of paths for the Windows runtime installations to package. This is critical to resolving the previous issue with the unified installer build: we would clobber the paths as there was no android and windows platform differentiation. The changes removed the need for the variants of the shared library as all the architectures are now included into a single MSI, simply split up amongst the CABs.
1 parent 6ad5599 commit 396c15d

30 files changed

+5210
-2440
lines changed

‎platforms/Windows/Directory.Build.props‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,6 @@
6767

6868
<Import Project="$(USERNAME).props" Condition="Exists('$(USERNAME).props')" />
6969

70-
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
71-
<PLATFORM_ROOT>$(PLATFORM_ROOT_X86)</PLATFORM_ROOT>
72-
<SDK_ROOT>$(SDK_ROOT_X86)</SDK_ROOT>
73-
</PropertyGroup>
74-
75-
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
76-
<PLATFORM_ROOT>$(PLATFORM_ROOT_AMD64)</PLATFORM_ROOT>
77-
<SDK_ROOT>$(SDK_ROOT_AMD64)</SDK_ROOT>
78-
</PropertyGroup>
79-
80-
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' ">
81-
<PLATFORM_ROOT>$(PLATFORM_ROOT_ARM)</PLATFORM_ROOT>
82-
<SDK_ROOT>$(SDK_ROOT_ARM)</SDK_ROOT>
83-
</PropertyGroup>
84-
85-
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
86-
<PLATFORM_ROOT>$(PLATFORM_ROOT_ARM64)</PLATFORM_ROOT>
87-
<SDK_ROOT>$(SDK_ROOT_ARM64)</SDK_ROOT>
88-
</PropertyGroup>
89-
9070
<PropertyGroup>
9171
<DefaultCompressionLevel Condition="'$(DefaultCompressionLevel)' == ''">$(PackageCompressionLevel)</DefaultCompressionLevel>
9272

@@ -100,8 +80,10 @@
10080
IsBundleCompressed=$(IsBundleCompressed);
10181
ArePackageCabsEmbedded=$(ArePackageCabsEmbedded);
10282
BaseReleaseDownloadUrl=$(BaseReleaseDownloadUrl);
103-
SDK_ROOT=$(SDK_ROOT);
104-
PLATFORM_ROOT=$(PLATFORM_ROOT);
83+
ImageRoot=$(ImageRoot);
84+
WindowsRuntimeARM64=$(WindowsRuntimeARM64);
85+
WindowsRuntimeX64=$(WindowsRuntimeX64);
86+
WindowsRuntimeX86=$(WindowsRuntimeX86);
10587
</DefineConstants>
10688
</PropertyGroup>
10789

‎platforms/Windows/Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
3-
<ItemGroup Condition="'$(MSBuildProjectName)' != 'shared' AND '$(MSBuildProjectName)' != 'sdk' AND '$(MSBuildProjectName)' != 'rtllib' AND '$(MSBuildProjectName)' != 'rtlmsm'">
3+
<ItemGroup Condition="'$(MSBuildProjectName)' != 'shared' AND '$(MSBuildProjectName)' != 'rtllib' AND '$(MSBuildProjectName)' != 'rtlmsm'">
44
<ProjectReference Include="$(MSBuildThisFileDirectory)shared\shared.wixproj" />
55
</ItemGroup>
66

‎platforms/Windows/SideBySideUpgradeStrategy.props‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,8 @@
2222
<DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
2323
<IdeUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeUpgradeCode>
2424
<RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
25-
<WindowsSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'x86' ">{443F4D7F-38F3-47C8-9BEE-37FEB01D13C8}</WindowsSDKUpgradeCode>
26-
<WindowsSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'amd64' ">{762D10FE-EBE5-4554-BB78-FB13A4A487E3}</WindowsSDKUpgradeCode>
27-
<WindowsSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm64' ">{9749D9E6-E860-4FF6-9E8A-525270F471A3}</WindowsSDKUpgradeCode>
28-
<AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm64' ">{485f88f4-9342-48cb-853a-12da885a5818}</AndroidSDKUpgradeCode>
29-
<AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'amd64' ">{0838ee60-5d4a-4832-b844-73dad6eb1cc1}</AndroidSDKUpgradeCode>
30-
<AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm' ">{1269a926-3528-4ab7-b4d6-386d5c3f903a}</AndroidSDKUpgradeCode>
31-
<AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'x86' ">{d889349b-0000-4600-a04a-93602525d5db}</AndroidSDKUpgradeCode>
25+
<AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
26+
<WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
3227
</PropertyGroup>
3328

3429
<PropertyGroup Condition="'$(MajorMinorProductVersion)' == '0.0'">
@@ -64,8 +59,8 @@
6459
DbgUpgradeCode=$(DbgUpgradeCode);
6560
IdeUpgradeCode=$(IdeUpgradeCode);
6661
RtlUpgradeCode=$(RtlUpgradeCode);
67-
WindowsSDKUpgradeCode=$(WindowsSDKUpgradeCode);
68-
AndroidSDKUpgradeCode=$(AndroidSDKUpgradeCode);
62+
AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
63+
WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
6964
</DefineConstants>
7065
</PropertyGroup>
7166
</Project>

‎platforms/Windows/bld/bld.wixproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
<PropertyGroup>
33
<DefineConstants>
44
$(DefineConstants);
5-
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
6-
TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
7-
TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
5+
_USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
6+
_USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
87
WORKAROUND_MIMALLOC_ISSUE_997=$(WORKAROUND_MIMALLOC_ISSUE_997);
98
</DefineConstants>
109
</PropertyGroup>
@@ -14,21 +13,21 @@
1413
</ItemGroup>
1514

1615
<ItemGroup>
17-
<HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\clang">
16+
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang">
1817
<ComponentGroupName>ClangResources</ComponentGroupName>
1918
<DirectoryRefId>_usr_lib_clang</DirectoryRefId>
20-
<PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_CLANG</PreprocessorVariable>
19+
<PreprocessorVariable>var._USR_LIB_CLANG</PreprocessorVariable>
2120
<SuppressCom>true</SuppressCom>
2221
<SuppressRegistry>true</SuppressRegistry>
2322
<SuppressRootDirectory>true</SuppressRootDirectory>
2423
</HarvestDirectory>
2524
</ItemGroup>
2625

2726
<ItemGroup>
28-
<HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\swift\clang">
27+
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang">
2928
<ComponentGroupName>SwiftClangResources</ComponentGroupName>
3029
<DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
31-
<PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG</PreprocessorVariable>
30+
<PreprocessorVariable>var._USR_LIB_SWIFT_CLANG</PreprocessorVariable>
3231
<SuppressCom>true</SuppressCom>
3332
<SuppressRegistry>true</SuppressRegistry>
3433
<SuppressRootDirectory>true</SuppressRootDirectory>

0 commit comments

Comments
 (0)