Skip to content

Commit 745ce4b

Browse files
committed
WiX: package up clangd on Windows
We were not packaging clangd.exe into the toolchain distribution which is required for SourceKit-LSP. Add the binary into the ARM64 and AMD64 packages.
1 parent 1bda936 commit 745ce4b

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

platforms/Windows/toolchain-amd64.wxs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,9 @@
291291
<Component Id="clang.exe" Directory="_usr_bin" Guid="030da6e7-c5f4-4cdc-9273-5969ad514c35">
292292
<File Id="clang.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang.exe" Checksum="yes" />
293293
</Component>
294+
<Component Id="clangd.exe" Directory="_usr_bin" Guid="58086480-e113-4a75-9816-4070d6a1d1e6">
295+
<File Id="clangd.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clangd.exe" Checksum="yes" />
296+
</Component>
294297
<!--
295298
TODO(compnerd) we should include clang-offload-bundler, clang-refactor, clang-rename, optremarks.dll, scan-build, scan-view
296299
-->
@@ -356,6 +359,9 @@
356359
<Component Id="clang.pdb" Directory="_usr_bin" Guid="1259c5a6-7418-4cd7-aab1-e6912c37b1e3">
357360
<File Id="clang.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang.pdb" Checksum="yes" DiskId="3" />
358361
</Component>
362+
<Component Id="clangd.pdb" Source="_usr_bin" Guid="9afe1bc9-a814-45e2-ba6a-505f4f18592a">
363+
<File Id="clangd.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clangd.pdb" Checksum="yes" DiskId="3" />
364+
</Component>
359365

360366
<Component Id="libclang.pdb" Directory="_usr_bin" Guid="d2d21dac-e7cb-494f-96be-c271af6cd02b">
361367
<File Id="libclang.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\libclang.pdb" Checksum="yes" DiskId="3" />

platforms/Windows/toolchain-arm64.wxs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,9 @@
291291
<Component Id="clang.exe" Directory="_usr_bin" Guid="c9a8f452-5dfe-456f-a3fd-3bf9bba688bf">
292292
<File Id="clang.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang.exe" Checksum="yes" />
293293
</Component>
294+
<Component Id="clangd.exe" Directory="_usr_bin" Guid="58086480-e113-4a75-9816-4070d6a1d1e6">
295+
<File Id="clangd.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clangd.exe" Checksum="yes" />
296+
</Component>
294297
<!--
295298
TODO(compnerd) we should include clang-offload-bundler, clang-refactor, clang-rename, optremarks.dll, scan-build, scan-view
296299
-->
@@ -356,6 +359,9 @@
356359
<Component Id="clang.pdb" Directory="_usr_bin" Guid="737d7fd3-c932-494b-bfa6-0e3ac9b2820c">
357360
<File Id="clang.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang.pdb" Checksum="yes" DiskId="3" />
358361
</Component>
362+
<Component Id="clangd.pdb" Source="_usr_bin" Guid="9afe1bc9-a814-45e2-ba6a-505f4f18592a">
363+
<File Id="clangd.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clangd.pdb" Checksum="yes" DiskId="3" />
364+
</Component>
359365

360366
<Component Id="libclang.pdb" Directory="_usr_bin" Guid="db1b1f54-5646-4e5a-98d2-ef524703bab3">
361367
<File Id="libclang.pdb" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\libclang.pdb" Checksum="yes" DiskId="3" />

0 commit comments

Comments
 (0)