Skip to content

Reflect variant name in directory ids #432

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+151 −151
Open

Reflect variant name in directory ids #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c6f84d
Rename toolchain directory id from ToolchainsVersioned to ToolchainsV…
mhegazy Jun 11, 2025
6656be0
Use toolchain variant name in directory ids
mhegazy Jun 12, 2025
51aadac
use toolchain instead of toolchains in directory ids
mhegazy Jun 26, 2025
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
4 changes: 2 additions & 2 deletions platforms/Windows/bld/asserts/bld.asserts.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ItemGroup>
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang">
<ComponentGroupName>ClangResources_asserts</ComponentGroupName>
<DirectoryRefId>_usr_lib_clang</DirectoryRefId>
<DirectoryRefId>toolchain_asserts_usr_lib_clang</DirectoryRefId>
<PreprocessorVariable>var._USR_LIB_CLANG</PreprocessorVariable>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
Expand All @@ -26,7 +26,7 @@
<ItemGroup>
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang">
<ComponentGroupName>SwiftClangResources_asserts</ComponentGroupName>
<DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
<DirectoryRefId>toolchain_asserts_usr_lib_swift_clang</DirectoryRefId>
<PreprocessorVariable>var._USR_LIB_SWIFT_CLANG</PreprocessorVariable>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
Expand Down
92 changes: 46 additions & 46 deletions platforms/Windows/bld/bld.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@
<WixVariable Id="SideBySidePackageUpgradeCode" Value="$(BldAssertsUpgradeCode)" />
<FeatureGroupRef Id="SideBySideUpgradeStrategy" />

<DirectoryRef Id="_usr_include">
<Directory Id="_usr_include_llvm_c" Name="llvm-c" />
<Directory Id="_usr_include_swift" Name="swift" />
<DirectoryRef Id="toolchain_asserts_usr_include">
<Directory Id="toolchain_asserts_usr_include_llvm_c" Name="llvm-c" />
<Directory Id="toolchain_asserts_usr_include_swift" Name="swift" />
</DirectoryRef>

<DirectoryRef Id="_usr_lib_swift">
<Directory Id="_usr_lib_swift_migrator" Name="migrator" />
<Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
<DirectoryRef Id="toolchain_asserts_usr_lib_swift">
<Directory Id="toolchain_asserts_usr_lib_swift_migrator" Name="migrator" />
<Directory Id="toolchain_asserts_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
</DirectoryRef>

<DirectoryRef Id="_usr_share">
<Directory Id="_usr_share_clang" Name="clang" />
<Directory Id="_usr_share_swift" Name="swift" />
<Directory Id="_usr_share_doc" Name="doc">
<Directory Id="_usr_share_doc_swift" Name="swift">
<Directory Id="_usr_share_doc_swift_diagnostics" Name="diagnostics">
<DirectoryRef Id="toolchain_asserts_usr_share">
<Directory Id="toolchain_asserts_usr_share_clang" Name="clang" />
<Directory Id="toolchain_asserts_usr_share_swift" Name="swift" />
<Directory Id="toolchain_asserts_usr_share_doc" Name="doc">
<Directory Id="toolchain_asserts_usr_share_doc_swift" Name="swift">
<Directory Id="toolchain_asserts_usr_share_doc_swift_diagnostics" Name="diagnostics">
</Directory>
</Directory>
</Directory>
</DirectoryRef>

<ComponentGroup Id="cmark_gfm" Directory="_usr_bin">
<ComponentGroup Id="cmark_gfm" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin/cmark-gfm.dll" />
</Component>
Expand All @@ -46,7 +46,7 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="binutils" Directory="_usr_bin">
<ComponentGroup Id="binutils" Directory="toolchain_asserts_usr_bin">
<!-- TODO(compnerd) can we use symbolic links to llvm-ar.exe instead? -->
<Component>
<File Source="$(ToolchainRoot)\usr\bin\llvm-dlltool.exe" />
Expand Down Expand Up @@ -145,26 +145,26 @@
</ComponentGroup>

<ComponentGroup Id="lto">
<Component Directory="_usr_bin">
<Component Directory="toolchain_asserts_usr_bin">
<File Source="$(ToolchainRoot)\usr\bin\LTO.dll" />
</Component>

<Component Directory="_usr_lib">
<Component Directory="toolchain_asserts_usr_lib">
<File Source="$(ToolchainRoot)\usr\lib\LTO.lib" />
</Component>

<Component Directory="_usr_include_llvm_c">
<Component Directory="toolchain_asserts_usr_include_llvm_c">
<File Source="$(ToolchainRoot)\usr\include\llvm-c\lto.h" />
</Component>
</ComponentGroup>

<ComponentGroup Id="ClangFeatures" Directory="_usr_share_clang">
<ComponentGroup Id="ClangFeatures" Directory="toolchain_asserts_usr_share_clang">
<Component>
<File Source="$(ToolchainRoot)\usr\share\clang\features.json" />
</Component>
</ComponentGroup>

<ComponentGroup Id="clang" Directory="_usr_bin">
<ComponentGroup Id="clang" Directory="toolchain_asserts_usr_bin">
<ComponentGroupRef Id="ClangFeatures" />

<!-- TODO(compnerd) can we use symbolic links to clang.exe instead? -->
Expand Down Expand Up @@ -195,7 +195,7 @@
-->
</ComponentGroup>

<ComponentGroup Id="lld" Directory="_usr_bin">
<ComponentGroup Id="lld" Directory="toolchain_asserts_usr_bin">
<!-- TODO(compnerd) can we use symbolic links to lld.exe instead? -->
<Component>
<File Source="$(ToolchainRoot)\usr\bin\ld.lld.exe" />
Expand All @@ -215,30 +215,30 @@
</ComponentGroup>

<ComponentGroup Id="BlocksRuntime">
<Component Directory="_usr_bin">
<Component Directory="toolchain_asserts_usr_bin">
<File Source="$(ToolchainRoot)\usr\bin\BlocksRuntime.dll" />
</Component>

<Component Directory="_usr_lib">
<Component Directory="toolchain_asserts_usr_lib">
<File Source="$(ToolchainRoot)\usr\lib\BlocksRuntime.lib" />
</Component>

<!-- TODO(compnerd) should we install the block headers? -->
</ComponentGroup>

<ComponentGroup Id="libdispatch">
<Component Directory="_usr_bin">
<Component Directory="toolchain_asserts_usr_bin">
<File Source="$(ToolchainRoot)\usr\bin\dispatch.dll" />
</Component>

<Component Directory="_usr_lib">
<Component Directory="toolchain_asserts_usr_lib">
<File Source="$(ToolchainRoot)\usr\lib\dispatch.lib" />
</Component>

<!-- TODO(compnerd) should we install the dispatch headers? -->
</ComponentGroup>

<ComponentGroup Id="SwiftCxx" Directory="_usr_lib_swift_swiftToCxx">
<ComponentGroup Id="SwiftCxx" Directory="toolchain_asserts_usr_lib_swift_swiftToCxx">
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
</Component>
Expand All @@ -249,27 +249,27 @@
<File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" />
</Component>

<Component Directory="_usr_include_swift">
<Component Directory="toolchain_asserts_usr_include_swift">
<File Source="$(ToolchainRoot)\usr\include\swift\bridging.modulemap" />
</Component>
<Component Directory="_usr_include_swift">
<Component Directory="toolchain_asserts_usr_include_swift">
<File Source="$(ToolchainRoot)\usr\include\swift\bridging" />
</Component>
<Component Directory="_usr_include_swift">
<Component Directory="toolchain_asserts_usr_include_swift">
<File Source="$(ToolchainRoot)\usr\include\module.modulemap" />
</Component>
</ComponentGroup>

<ComponentGroup Id="SwiftDemangle">
<Component Directory="_usr_bin">
<Component Directory="toolchain_asserts_usr_bin">
<File Source="$(ToolchainRoot)\usr\bin\swiftDemangle.dll" />
</Component>
<Component Directory="_usr_lib">
<Component Directory="toolchain_asserts_usr_lib">
<File Source="$(ToolchainRoot)\usr\lib\swiftDemangle.lib" />
</Component>
</ComponentGroup>

<ComponentGroup Id="SwiftEducationalNotes" Directory="_usr_share_doc_swift_diagnostics">
<ComponentGroup Id="SwiftEducationalNotes" Directory="toolchain_asserts_usr_share_doc_swift_diagnostics">
<Component>
<File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\dynamic-callable-requirements.md" />
</Component>
Expand Down Expand Up @@ -308,13 +308,13 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="SwiftFeatures" Directory="_usr_share_swift">
<ComponentGroup Id="SwiftFeatures" Directory="toolchain_asserts_usr_share_swift">
<Component>
<File Source="$(ToolchainRoot)\usr\share\swift\features.json" />
</Component>
</ComponentGroup>

<ComponentGroup Id="SwiftMigrator" Directory="_usr_lib_swift_migrator">
<ComponentGroup Id="SwiftMigrator" Directory="toolchain_asserts_usr_lib_swift_migrator">
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\migrator\ios4.json" />
</Component>
Expand Down Expand Up @@ -347,7 +347,7 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="swift" Directory="_usr_bin">
<ComponentGroup Id="swift" Directory="toolchain_asserts_usr_bin">
<ComponentGroupRef Id="SwiftCxx" />
<ComponentGroupRef Id="SwiftDemangle" />
<ComponentGroupRef Id="SwiftEducationalNotes" />
Expand All @@ -372,7 +372,7 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="SwiftMacros" Directory="_usr_bin">
<ComponentGroup Id="SwiftMacros" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\ObservationMacros.dll" />
</Component>
Expand All @@ -381,25 +381,25 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="FoundationMacros" Directory="_usr_bin">
<ComponentGroup Id="FoundationMacros" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\FoundationMacros.dll" />
</Component>
</ComponentGroup>

<ComponentGroup Id="TestingMacros" Directory="_usr_bin">
<ComponentGroup Id="TestingMacros" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\TestingMacros.dll" />
</Component>
</ComponentGroup>

<ComponentGroup Id="argument_parser" Directory="_usr_bin">
<ComponentGroup Id="argument_parser" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\ArgumentParser.dll" />
</Component>
</ComponentGroup>

<ComponentGroup Id="tools_support_core" Directory="_usr_bin">
<ComponentGroup Id="tools_support_core" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\TSCBasic.dll" />
</Component>
Expand All @@ -408,7 +408,7 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="swift_driver" Directory="_usr_bin">
<ComponentGroup Id="swift_driver" Directory="toolchain_asserts_usr_bin">
<!-- TODO(compnerd) can we use symbolic links to swift.exe instead? -->
<Component>
<File Name="swiftc.exe" Source="$(ToolchainRoot)\usr\bin\swift-driver.exe" />
Expand All @@ -432,7 +432,7 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="compiler_swift_syntax" Directory="_usr_bin">
<ComponentGroup Id="compiler_swift_syntax" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftBasicFormat.dll" />
</Component>
Expand Down Expand Up @@ -474,7 +474,7 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="swift_syntax" Directory="_usr_bin">
<ComponentGroup Id="swift_syntax" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\SwiftBasicFormat.dll" />
</Component>
Expand Down Expand Up @@ -516,7 +516,7 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="plugin_server" Directory="_usr_bin">
<ComponentGroup Id="plugin_server" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\swift-plugin-server.exe" />
</Component>
Expand All @@ -525,7 +525,7 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="mimalloc" Directory="_usr_bin">
<ComponentGroup Id="mimalloc" Directory="toolchain_asserts_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin\mimalloc.dll" />
</Component>
Expand All @@ -539,13 +539,13 @@
</ComponentGroup>

<ComponentGroup Id="Configuration">
<Component Directory="ToolchainsVersioned">
<Component Directory="ToolchainVersionedAsserts">
<File Source="$(ToolchainRoot)\ToolchainInfo.plist" />
</Component>
</ComponentGroup>

<ComponentGroup Id="EnvironmentVariables">
<Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="_usr_bin" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
<Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="toolchain_asserts_usr_bin" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
<Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[_usr_bin]" />
</Component>
</ComponentGroup>
Expand Down
2 changes: 1 addition & 1 deletion platforms/Windows/cli/asserts/cli.asserts.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
<HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
<ComponentGroupName>DocCRender_asserts</ComponentGroupName>
<DirectoryRefId>_usr_share_docc_render</DirectoryRefId>
<DirectoryRefId>toolchain_asserts_usr_share_docc_render</DirectoryRefId>
<PreprocessorVariable>var.SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST</PreprocessorVariable>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
Expand Down
Loading