Skip to content

WiX: remove Yams from the toolchain distribution #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2023
Merged

WiX: remove Yams from the toolchain distribution #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions platforms/Windows/toolchain-amd64.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<Media Id="10" Cabinet="PDBs.llbuild.cab" />
<Media Id="11" Cabinet="PDBs.ArgumentParser.cab" />
<Media Id="12" Cabinet="PDBs.ToolsSupportCore.cab" />
<Media Id="13" Cabinet="PDBs.Yams.cab" />
<Media Id="14" Cabinet="PDBs.swift-driver.cab" />
<Media Id="13" Cabinet="PDBs.swift-driver.cab" />
<?endif?>

<!-- Directory Structure -->
Expand Down Expand Up @@ -722,20 +721,6 @@
</ComponentGroup>
<?endif?>

<ComponentGroup Id="Yams">
<Component Id="Yams.dll" Directory="_usr_bin" Guid="ddaf995c-a415-457f-a6d2-8721658cf18a">
<File Id="Yams.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.dll" Checksum="yes" />
</Component>
</ComponentGroup>

<?ifdef INCLUDE_DEBUG_INFO ?>
<ComponentGroup Id="YamsDebugInfo">
<Component Id="Yams.pdb" Directory="_usr_bin" Guid="20e45503-ba75-4eff-a275-4f94ac6526b0">
<File Id="Yams.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.pdb" Checksum="yes" DiskId="13" />
</Component>
</ComponentGroup>
<?endif?>

<ComponentGroup Id="SwiftDriver">
<!-- TODO(compnerd) can we use symbolic links instead? -->
<Component Id="swiftc.exe" Directory="_usr_bin" Guid="6a62153c-754c-4634-a072-403538b77404">
Expand Down Expand Up @@ -806,7 +791,6 @@
<ComponentGroupRef Id="llbuild" />
<ComponentGroupRef Id="SwiftArgumentParser" />
<ComponentGroupRef Id="SwiftToolsSupportCore" />
<ComponentGroupRef Id="Yams" />
<ComponentGroupRef Id="SwiftDriver" />

<ComponentGroupRef Id="ClangResources" />
Expand All @@ -830,7 +814,6 @@
<ComponentGroupRef Id="llbuildDebugInfo" />
<ComponentGroupRef Id="SwiftArgumentParserDebugInfo" />
<ComponentGroupRef Id="SwiftToolsSupportCoreDebugInfo" />
<ComponentGroupRef Id="YamsDebugInfo" />
<ComponentGroupRef Id="SwiftDriverDebugInfo" />
</Feature>
<?endif?>
Expand Down
19 changes: 1 addition & 18 deletions platforms/Windows/toolchain-arm64.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<Media Id="10" Cabinet="PDBs.llbuild.cab" />
<Media Id="11" Cabinet="PDBs.ArgumentParser.cab" />
<Media Id="12" Cabinet="PDBs.ToolsSupportCore.cab" />
<Media Id="13" Cabinet="PDBs.Yams.cab" />
<Media Id="14" Cabinet="PDBs.swift-driver.cab" />
<Media Id="13" Cabinet="PDBs.swift-driver.cab" />
<?endif?>

<!-- Directory Structure -->
Expand Down Expand Up @@ -722,20 +721,6 @@
</ComponentGroup>
<?endif?>

<ComponentGroup Id="Yams">
<Component Id="Yams.dll" Directory="_usr_bin" Guid="d777b16f-f1e7-4ff7-a9d7-d723e5e6f3c5">
<File Id="Yams.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.dll" Checksum="yes" />
</Component>
</ComponentGroup>

<?ifdef INCLUDE_DEBUG_INFO ?>
<ComponentGroup Id="YamsDebugInfo">
<Component Id="Yams.pdb" Directory="_usr_bin" Guid="3cc239b3-7f89-4802-9d88-4a48b5710c55">
<File Id="Yams.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Yams.pdb" Checksum="yes" DiskId="13" />
</Component>
</ComponentGroup>
<?endif?>

<ComponentGroup Id="SwiftDriver">
<!-- TODO(compnerd) can we use symbolic links instead? -->
<Component Id="swiftc.exe" Directory="_usr_bin" Guid="844e82b0-d6e9-45a2-a79f-dd117b1d6cd9">
Expand Down Expand Up @@ -806,7 +791,6 @@
<ComponentGroupRef Id="llbuild" />
<ComponentGroupRef Id="SwiftArgumentParser" />
<ComponentGroupRef Id="SwiftToolsSupportCore" />
<ComponentGroupRef Id="Yams" />
<ComponentGroupRef Id="SwiftDriver" />

<ComponentGroupRef Id="ClangResources" />
Expand All @@ -830,7 +814,6 @@
<ComponentGroupRef Id="llbuildDebugInfo" />
<ComponentGroupRef Id="SwiftArgumentParserDebugInfo" />
<ComponentGroupRef Id="SwiftToolsSupportCoreDebugInfo" />
<ComponentGroupRef Id="YamsDebugInfo" />
<ComponentGroupRef Id="SwiftDriverDebugInfo" />
</Feature>
<?endif?>
Expand Down