Reflect variant name in directory ids #432
Open
+151
−151
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhegazy
changed the title
compnerd
reviewed
Jun 26, 2025
changed to use singular toolchain |
|
The installer built properly the test failures are unrelated. |
compnerd
approved these changes
Jul 3, 2025
mhegazy
force-pushed
the
variant-specific-directories
branch
from
6381eef to
51aadac
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a follow up change to #428. In this PR we are making directory IDs reflect the variant in the name of the install directory (e.g.
Swift\Toolchains\6.2.0+Asserts\usr).There is no functional change in this change, it is just directory ids. Directory names and which components are installed to which directories should not be changed.
This should make it easier to add new variants by following the same pattern, and will allow us to parametrize authoring that is shared between variants.
Naming convention:
ToolchainsVersionedbecameToolchainsVersionedAsserts-- this is our top-level toolchain install directory likeSwift\Toolchains\0.0.0+Asserts_usr_sharebecametoolchains_asserts_usr_shareto reflect the full path at install time i.e.``Swift\Toolchains\0.0.0+Asserts\usr\share`