Skip to content

[windows] add usr/lib/swift/clang to the toolchain installer #336

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
Sep 9, 2024
Merged

[windows] add usr/lib/swift/clang to the toolchain installer #336

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
12 changes: 12 additions & 0 deletions platforms/Windows/bld/bld.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
</DefineConstants>
</PropertyGroup>

Expand All @@ -22,4 +23,15 @@
<SuppressRootDirectory>true</SuppressRootDirectory>
</HarvestDirectory>
</ItemGroup>

<ItemGroup>
<HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\swift\clang">
<ComponentGroupName>SwiftClangResources</ComponentGroupName>
<DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
<PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG</PreprocessorVariable>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
<SuppressRootDirectory>true</SuppressRootDirectory>
</HarvestDirectory>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions platforms/Windows/bld/bld.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@
<ComponentGroupRef Id="TestingMacros" />

<ComponentGroupRef Id="ClangResources" />
<ComponentGroupRef Id="SwiftClangResources" />

<ComponentGroupRef Id="EnvironmentVariables" />
<ComponentGroupRef Id="VersionedDirectoryCleanup" />
Expand Down
4 changes: 3 additions & 1 deletion platforms/Windows/shared/shared.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
<Directory Id="_usr_include" Name="include" />
<Directory Id="_usr_lib" Name="lib">
<Directory Id="_usr_lib_clang" Name="clang" />
<Directory Id="_usr_lib_swift" Name="swift" />
<Directory Id="_usr_lib_swift" Name="swift">
<Directory Id="_usr_lib_swift_clang" Name="clang" />
</Directory>
</Directory>
<Directory Id="_usr_share" Name="share">
<Directory Id="_usr_share_docc" Name="docc">
Expand Down