Skip to content

Commit 6ab8eff

Browse files
authored
Merge pull request swiftlang#146 from apple/revert-145-syn-city
Revert "Update Installer Scripts for sourcekit-lsp to Include SwiftSyntax"
2 parents 14a29b4 + 4350617 commit 6ab8eff

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

platforms/Windows/devtools-amd64.wxs

-16
Original file line numberDiff line numberDiff line change
@@ -210,20 +210,6 @@
210210
</ComponentGroup>
211211
<?endif?>
212212

213-
<ComponentGroup Id="SwiftSyntax">
214-
<Component Id="SwiftSyntax.dll" Directory="_usr_bin" Guid="993a205e-3f9c-4033-8004-5ecd28141b1f">
215-
<File Id="SwiftSyntax.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftSyntax.dll" Checksum="yes" />
216-
</Component>
217-
</ComponentGroup>
218-
219-
<?ifdef INCLUDE_DEBUG_INFO ?>
220-
<ComponentGroup Id="SwiftSyntaxDebugInfo">
221-
<Component Id="SwiftSyntax.pdb" Directory="_usr_bin" Guid="8973f7dc-06d8-49fc-b5bf-51368dbea1d4">
222-
<File Id="SwiftSyntax.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftSyntax.pdb" Checksum="yes" />
223-
</Component>
224-
</ComponentGroup>
225-
<?endif?>
226-
227213
<ComponentGroup Id="IndexStoreDB">
228214
<Component Id="IndexStoreDB.dll" Directory="_usr_bin" Guid="cc64657d-581f-4295-9834-5471d6cd8aaa">
229215
<File Id="IndexStoreDB.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\IndexStoreDB.dll" Checksum="yes" />
@@ -259,7 +245,6 @@
259245
<ComponentGroupRef Id="SwiftPackageManager" />
260246
<ComponentGroupRef Id="SourceKitLSP" />
261247
<ComponentGroupRef Id="IndexStoreDB" />
262-
<ComponentGroupRef Id="SwiftSyntax" />
263248

264249
<?ifdef INCLUDE_DEBUG_INFO ?>
265250
<Feature Id="DebugInfo" Absent="allow" AllowAdvertise="yes" Description="Debug Information for Swift Developer Tools for Windows x86_64" Level="0" Title="Debug Info">
@@ -270,7 +255,6 @@
270255
<ComponentGroupRef Id="SwiftPackageManagerDebugInfo" />
271256
<ComponentGroupRef Id="SourceKitLSPDebugInfo" />
272257
<ComponentGroupRef Id="IndexStoreDBDebugInfo" />
273-
<ComponentGroupRef Id="SwiftSyntaxDebugInfo" />
274258
</Feature>
275259
<?endif?>
276260
</Feature>

platforms/Windows/devtools-arm64.wxs

-16
Original file line numberDiff line numberDiff line change
@@ -224,20 +224,6 @@
224224
</ComponentGroup>
225225
<?endif?>
226226

227-
<ComponentGroup Id="SwiftSyntax">
228-
<Component Id="SwiftSyntax.dll" Directory="_usr_bin" Guid="e531a79d-187f-4b2d-80bc-a2267a953c60">
229-
<File Id="SwiftSyntax.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftSyntax.dll" Checksum="yes" />
230-
</Component>
231-
</ComponentGroup>
232-
233-
<?ifdef INCLUDE_DEBUG_INFO ?>
234-
<ComponentGroup Id="SwiftSyntaxDebugInfo">
235-
<Component Id="SwiftSyntax.pdb" Directory="_usr_bin" Guid="c95d81d7-d6f9-423c-933e-b59b99006218">
236-
<File Id="SwiftSyntax.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftSyntax.pdb" Checksum="yes" />
237-
</Component>
238-
</ComponentGroup>
239-
<?endif?>
240-
241227
<ComponentGroup Id="SourceKitLSP">
242228
<Component Id="sourcekit_lsp.exe" Directory="_usr_bin" Guid="1e4d7fbd-a435-4d11-bd17-2dec0b235c28">
243229
<File Id="sourcekit_lsp.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\sourcekit-lsp.exe" Checksum="yes" />
@@ -259,7 +245,6 @@
259245
<ComponentGroupRef Id="SwiftPackageManager" />
260246
<ComponentGroupRef Id="SourceKitLSP" />
261247
<ComponentGroupRef Id="IndexStoreDB" />
262-
<ComponentGroupRef Id="SwiftSyntax" />
263248

264249
<?ifdef INCLUDE_DEBUG_INFO ?>
265250
<Feature Id="DebugInfo" Absent="allow" AllowAdvertise="yes" Description="Debug Information for Swift Developer Tools for Windows aarch64" Level="0" Title="Debug Info">
@@ -270,7 +255,6 @@
270255
<ComponentGroupRef Id="SwiftPackageManagerDebugInfo" />
271256
<ComponentGroupRef Id="SourceKitLSPDebugInfo" />
272257
<ComponentGroupRef Id="IndexStoreDBDebugInfo" />
273-
<ComponentGroupRef Id="SwiftSyntaxDebugInfo" />
274258
</Feature>
275259
<?endif?>
276260
</Feature>

0 commit comments

Comments
 (0)