Skip to content

Commit af43ddb

Browse files
committed
Windows: remove _InternalSwiftSyntaxParser from packaging
This library has been removed from the Swift tree as of swiftlang/swift@2d07f38. Update the manifest to remove the references to permit building the packaging once again.
1 parent 4bbee13 commit af43ddb

File tree

2 files changed

+0
-42
lines changed

2 files changed

+0
-42
lines changed

platforms/Windows/toolchain-amd64.wxs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@
5151
<Directory Id="_usr_include" Name="include">
5252
<Directory Id="_usr_include__InternalSwiftScan" Name="_InternalSwiftScan">
5353
</Directory>
54-
<Directory Id="_usr_include__InternalSwiftSyntaxParser" Name="_InternalSwiftSyntaxParser">
55-
</Directory>
5654
<Directory Id="_usr_include_clang_c" Name="clang-c">
5755
</Directory>
5856
<Directory Id="_usr_include_dispatch" Name="dispatch">
@@ -568,29 +566,13 @@
568566
<Component Id="_InternalSwiftScan.dll" Directory="_usr_bin" Guid="005fd33d-c5b9-4897-a467-57023dc7283a">
569567
<File Id="_InternalSwiftScan.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftScan.dll" Checksum="yes" />
570568
</Component>
571-
<Component Id="_InternalSwiftSyntaxParser.dll" Directory="_usr_bin" Guid="c1671803-38a2-425e-9413-b3dcdcd5bdaf">
572-
<File Id="_InternalSwiftSyntaxParser.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftSyntaxParser.dll" Checksum="yes" />
573-
</Component>
574569

575570
<Component Id="swiftDemangle.lib" Directory="_usr_lib" Guid="65907d9f-5762-459f-9afb-321b6956102e">
576571
<File Id="swiftDemangle.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swiftDemangle.lib" Checksum="yes" />
577572
</Component>
578573
<Component Id="_InternalSwiftScan.lib" Directory="_usr_lib" Guid="4ea85284-8be7-4841-b808-8f4b210f9152">
579574
<File Id="_InternalSwiftScan.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\windows\_InternalSwiftScan.lib" Checksum="yes" />
580575
</Component>
581-
<Component Id="_InternalSwiftSyntaxParser.lib" Directory="_usr_lib" Guid="cdf81ee6-a0ec-40ac-b275-58811b0e0ecd">
582-
<File Id="_InternalSwiftSyntaxParser.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\windows\_InternalSwiftSyntaxParser.lib" Checksum="yes" />
583-
</Component>
584-
585-
<Component Id="SwiftSyntaxParser.h" Directory="_usr_include__InternalSwiftSyntaxParser" Guid="a5ce3a92-310b-437f-9167-967fbcc83f93">
586-
<File Id="SwiftSyntaxParser.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\SwiftSyntaxParser.h" Checksum="yes" />
587-
</Component>
588-
<Component Id="SwiftSyntaxCDataTypes.h" Directory="_usr_include__InternalSwiftSyntaxParser" Guid="66f3b179-8fa2-4388-9d42-dfb97c7d434e">
589-
<File Id="SwiftSyntaxCDataTypes.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\SwiftSyntaxCDataTypes.h" Checksum="yes" />
590-
</Component>
591-
<Component Id="_InternalSwiftSyntaxParser.modulemap" Directory="_usr_include__InternalSwiftSyntaxParser" Guid="05effc98-9cba-4513-bab8-84a40a806684">
592-
<File Id="_InternalSwiftSyntaxParser.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\module.modulemap" Checksum="yes" />
593-
</Component>
594576

595577
<Component Id="DependencyScan.h" Directory="_usr_include__InternalSwiftScan" Guid="44c94a09-383d-4493-9918-347db8cccdc0">
596578
<File Id="DependencyScan.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\DependencyScan.h" Checksum="yes" />
@@ -653,9 +635,6 @@
653635
<Component Id="_InternalSwiftScan.pdb" Directory="_usr_bin" Guid="2321b5d4-fa60-495e-b275-3f0713c35278">
654636
<File Id="_InternalSwiftScan.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftScan.pdb" Checksum="yes" DiskId="9" />
655637
</Component>
656-
<Component Id="_InternalSwiftSyntaxParser.pdb" Directory="_usr_bin" Guid="363ff271-f7ab-4912-9d91-c29709f267a9">
657-
<File Id="_InternalSwiftSyntaxParser.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftSyntaxParser.pdb" Checksum="yes" DiskId="9" />
658-
</Component>
659638
</ComponentGroup>
660639
<?endif?>
661640

platforms/Windows/toolchain-arm64.wxs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@
5151
<Directory Id="_usr_include" Name="include">
5252
<Directory Id="_usr_include__InternalSwiftScan" Name="_InternalSwiftScan">
5353
</Directory>
54-
<Directory Id="_usr_include__InternalSwiftSyntaxParser" Name="_InternalSwiftSyntaxParser">
55-
</Directory>
5654
<Directory Id="_usr_include_clang_c" Name="clang-c">
5755
</Directory>
5856
<Directory Id="_usr_include_dispatch" Name="dispatch">
@@ -568,29 +566,13 @@
568566
<Component Id="_InternalSwiftScan.dll" Directory="_usr_bin" Guid="61c41a5a-5cfe-4624-a437-4cc63526554b">
569567
<File Id="_InternalSwiftScan.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftScan.dll" Checksum="yes" />
570568
</Component>
571-
<Component Id="_InternalSwiftSyntaxParser.dll" Directory="_usr_bin" Guid="07ea18c7-dcb1-442d-9079-ca1704e50f36">
572-
<File Id="_InternalSwiftSyntaxParser.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftSyntaxParser.dll" Checksum="yes" />
573-
</Component>
574569

575570
<Component Id="swiftDemangle.lib" Directory="_usr_lib" Guid="074961b5-43c4-4d47-a71d-d5feeed174ed">
576571
<File Id="swiftDemangle.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swiftDemangle.lib" Checksum="yes" />
577572
</Component>
578573
<Component Id="_InternalSwiftScan.lib" Directory="_usr_lib" Guid="7b5611ec-98f0-4043-b69b-94274e68141c">
579574
<File Id="_InternalSwiftScan.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\windows\_InternalSwiftScan.lib" Checksum="yes" />
580575
</Component>
581-
<Component Id="_InternalSwiftSyntaxParser.lib" Directory="_usr_lib" Guid="c1d75e75-026e-408b-b142-3344d4dc659c">
582-
<File Id="_InternalSwiftSyntaxParser.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\windows\_InternalSwiftSyntaxParser.lib" Checksum="yes" />
583-
</Component>
584-
585-
<Component Id="SwiftSyntaxParser.h" Directory="_usr_include__InternalSwiftSyntaxParser" Guid="a5ce3a92-310b-437f-9167-967fbcc83f93">
586-
<File Id="SwiftSyntaxParser.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\SwiftSyntaxParser.h" Checksum="yes" />
587-
</Component>
588-
<Component Id="SwiftSyntaxCDataTypes.h" Directory="_usr_include__InternalSwiftSyntaxParser" Guid="66f3b179-8fa2-4388-9d42-dfb97c7d434e">
589-
<File Id="SwiftSyntaxCDataTypes.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\SwiftSyntaxCDataTypes.h" Checksum="yes" />
590-
</Component>
591-
<Component Id="_InternalSwiftSyntaxParser.modulemap" Directory="_usr_include__InternalSwiftSyntaxParser" Guid="05effc98-9cba-4513-bab8-84a40a806684">
592-
<File Id="_InternalSwiftSyntaxParser.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftSyntaxParser\module.modulemap" Checksum="yes" />
593-
</Component>
594576

595577
<Component Id="DependencyScan.h" Directory="_usr_include__InternalSwiftScan" Guid="44c94a09-383d-4493-9918-347db8cccdc0">
596578
<File Id="DependencyScan.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\DependencyScan.h" Checksum="yes" />
@@ -653,9 +635,6 @@
653635
<Component Id="_InternalSwiftScan.pdb" Directory="_usr_bin" Guid="79269c96-4952-4028-b764-8cfbac6c2062">
654636
<File Id="_InternalSwiftScan.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftScan.pdb" Checksum="yes" DiskId="9" />
655637
</Component>
656-
<Component Id="_InternalSwiftSyntaxParser.pdb" Directory="_usr_bin" Guid="989843e9-e396-4ab3-bf48-36cd6be9c3fc">
657-
<File Id="_InternalSwiftSyntaxParser.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftSyntaxParser.pdb" Checksum="yes" DiskId="9" />
658-
</Component>
659638
</ComponentGroup>
660639
<?endif?>
661640

0 commit comments

Comments
 (0)