Skip to content

Commit 61addd0

Browse files
committed
Windows: clean up manifest file for devtools
The switch to swift-driver as the language driver forced a shuffling of the files. In the process, llbuild and Yams were moved into the toolchain MSI as they are required for using the toolchain. Furthermore, CYaml is no longer even available as it now is statically linked into the Yams library. Remove the references to their content.
1 parent 2c764ce commit 61addd0

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

platforms/Windows/devtools.wxs

+1-18
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,13 @@
1818
<Directory Id="USR" Name="usr">
1919
<Directory Id="USR_BIN" Name="bin">
2020
</Directory>
21-
<!--
22-
FIXME(compnerd) should we include the cyaml and llbuild headers?
23-
<Directory Id="USR_INCLUDE" Name="include">
24-
<Directory Id="USR_INCLUDE_CYAML" Name="cyaml">
25-
</Directory>
26-
<Directory Id="USR_INCLUDE_LLBUILD" Name="llbuild">
27-
</Directory>
28-
</Directory>
29-
-->
3021
<Directory Id="USR_LIB" Name="lib">
31-
<!-- FIXME(compnerd) should we include the TSC, SPM import libraries? -->
22+
<!-- FIXME(compnerd) should we include the SPM import libraries? -->
3223
<Directory Id="USR_LIB_SWIFT" Name="swift">
3324
<Directory Id="USR_LIB_SWIFT_PM" Name="pm">
3425
<Directory Id="USR_LIB_SWIFT_PM_MANIFEST_API" Name="ManifestAPI">
3526
</Directory>
3627
</Directory>
37-
<!--
38-
FIXME(compnerd) should we include the import libraries and swiftmodules for Yams, ArgumentParser?
39-
<Directory Id="USR_LIB_SWIFT_WINDOWS" Name="windows">
40-
<Directory Id="USR_LIB_SWIFT_WINDOWS_X86_64" Name="x86_64">
41-
</Directory>
42-
</Directory>
43-
-->
44-
<!-- FIXME(compnerd) should we include the llbuild import libraries? -->
4528
</Directory>
4629
</Directory>
4730
</Directory>

0 commit comments

Comments
 (0)