Skip to content

Commit fb88f71

Browse files
committed
Windows: fall back to old style of media handling
The new style media handling doesn't seem to work due to the naming of the cabinet. Simply fallback to the old schema for now.
1 parent 7d38d3c commit fb88f71

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

Diff for: platforms/Windows/toolchain.wxs

+9-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33
<Product Id="*" Language="1033" Manufacturer="swift.org" Name="Toolchain" UpgradeCode="9871289b-f9cb-4b39-8122-2c7ec1ab24d5" Version="$(var.ProductVersion)">
44
<Package Comments="Copyright (c) 2021 Swift Open Source Project" Compressed="yes" Description="Toolchain" InstallScope="perMachine" Manufacturer="swift.org" />
55

6-
<MediaTemplate CompressionLevel="high" EmbedCab="yes" />
7-
<Media Id="1" Cabinet="toolchain.cab" />
6+
<!--
7+
NOTE(compnerd) Use high compression as this is an extrodinarily large
8+
cabinet. With upstream being amenable to considering decorations for
9+
DLL builds, this might be possible to reduce in the future hopefully.
10+
In the mean time, burn the CPU cycles to try to claw back the minimal
11+
bit of savings to hedge against the constant complaints that the MSIs
12+
are too large.
13+
-->
14+
<Media Id="1" Cabinet="toolchain.cab" EmbedCab="yes" CompressionLevel="high" />
815

916
<?ifdef INCLUDE_DEBUG_INFO ?>
1017
<Media Id="2" Cabinet="clang_PDBs.cab" />

0 commit comments

Comments
 (0)