Skip to content

Commit ca4e8bf

Browse files
committed
WiX: remove Yams from the toolchain distribution
The toolchain can statically link Yams as there is a single user of the library. This internalisation of the library allows us to save ~256KB of space.
1 parent ecd81ce commit ca4e8bf

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

platforms/Windows/toolchain-amd64.wxs

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
<Media Id="10" Cabinet="PDBs.llbuild.cab" />
2626
<Media Id="11" Cabinet="PDBs.ArgumentParser.cab" />
2727
<Media Id="12" Cabinet="PDBs.ToolsSupportCore.cab" />
28-
<Media Id="13" Cabinet="PDBs.Yams.cab" />
29-
<Media Id="14" Cabinet="PDBs.swift-driver.cab" />
28+
<Media Id="13" Cabinet="PDBs.swift-driver.cab" />
3029
<?endif?>
3130

3231
<!-- Directory Structure -->
@@ -722,20 +721,6 @@
722721
</ComponentGroup>
723722
<?endif?>
724723

725-
<ComponentGroup Id="Yams">
726-
<Component Id="Yams.dll" Directory="_usr_bin" Guid="ddaf995c-a415-457f-a6d2-8721658cf18a">
727-
<File Id="Yams.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.dll" Checksum="yes" />
728-
</Component>
729-
</ComponentGroup>
730-
731-
<?ifdef INCLUDE_DEBUG_INFO ?>
732-
<ComponentGroup Id="YamsDebugInfo">
733-
<Component Id="Yams.pdb" Directory="_usr_bin" Guid="20e45503-ba75-4eff-a275-4f94ac6526b0">
734-
<File Id="Yams.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.pdb" Checksum="yes" DiskId="13" />
735-
</Component>
736-
</ComponentGroup>
737-
<?endif?>
738-
739724
<ComponentGroup Id="SwiftDriver">
740725
<!-- TODO(compnerd) can we use symbolic links instead? -->
741726
<Component Id="swiftc.exe" Directory="_usr_bin" Guid="6a62153c-754c-4634-a072-403538b77404">
@@ -806,7 +791,6 @@
806791
<ComponentGroupRef Id="llbuild" />
807792
<ComponentGroupRef Id="SwiftArgumentParser" />
808793
<ComponentGroupRef Id="SwiftToolsSupportCore" />
809-
<ComponentGroupRef Id="Yams" />
810794
<ComponentGroupRef Id="SwiftDriver" />
811795

812796
<ComponentGroupRef Id="ClangResources" />
@@ -830,7 +814,6 @@
830814
<ComponentGroupRef Id="llbuildDebugInfo" />
831815
<ComponentGroupRef Id="SwiftArgumentParserDebugInfo" />
832816
<ComponentGroupRef Id="SwiftToolsSupportCoreDebugInfo" />
833-
<ComponentGroupRef Id="YamsDebugInfo" />
834817
<ComponentGroupRef Id="SwiftDriverDebugInfo" />
835818
</Feature>
836819
<?endif?>

platforms/Windows/toolchain-arm64.wxs

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
<Media Id="10" Cabinet="PDBs.llbuild.cab" />
2626
<Media Id="11" Cabinet="PDBs.ArgumentParser.cab" />
2727
<Media Id="12" Cabinet="PDBs.ToolsSupportCore.cab" />
28-
<Media Id="13" Cabinet="PDBs.Yams.cab" />
29-
<Media Id="14" Cabinet="PDBs.swift-driver.cab" />
28+
<Media Id="13" Cabinet="PDBs.swift-driver.cab" />
3029
<?endif?>
3130

3231
<!-- Directory Structure -->
@@ -722,20 +721,6 @@
722721
</ComponentGroup>
723722
<?endif?>
724723

725-
<ComponentGroup Id="Yams">
726-
<Component Id="Yams.dll" Directory="_usr_bin" Guid="d777b16f-f1e7-4ff7-a9d7-d723e5e6f3c5">
727-
<File Id="Yams.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.dll" Checksum="yes" />
728-
</Component>
729-
</ComponentGroup>
730-
731-
<?ifdef INCLUDE_DEBUG_INFO ?>
732-
<ComponentGroup Id="YamsDebugInfo">
733-
<Component Id="Yams.pdb" Directory="_usr_bin" Guid="3cc239b3-7f89-4802-9d88-4a48b5710c55">
734-
<File Id="Yams.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.pdb" Checksum="yes" DiskId="13" />
735-
</Component>
736-
</ComponentGroup>
737-
<?endif?>
738-
739724
<ComponentGroup Id="SwiftDriver">
740725
<!-- TODO(compnerd) can we use symbolic links instead? -->
741726
<Component Id="swiftc.exe" Directory="_usr_bin" Guid="844e82b0-d6e9-45a2-a79f-dd117b1d6cd9">
@@ -806,7 +791,6 @@
806791
<ComponentGroupRef Id="llbuild" />
807792
<ComponentGroupRef Id="SwiftArgumentParser" />
808793
<ComponentGroupRef Id="SwiftToolsSupportCore" />
809-
<ComponentGroupRef Id="Yams" />
810794
<ComponentGroupRef Id="SwiftDriver" />
811795

812796
<ComponentGroupRef Id="ClangResources" />
@@ -830,7 +814,6 @@
830814
<ComponentGroupRef Id="llbuildDebugInfo" />
831815
<ComponentGroupRef Id="SwiftArgumentParserDebugInfo" />
832816
<ComponentGroupRef Id="SwiftToolsSupportCoreDebugInfo" />
833-
<ComponentGroupRef Id="YamsDebugInfo" />
834817
<ComponentGroupRef Id="SwiftDriverDebugInfo" />
835818
</Feature>
836819
<?endif?>

0 commit comments

Comments
 (0)