Skip to content

Commit 25805e0

Browse files
committed
WiX: add ToolchainInfo.plist to the build tools
Incorporate the `ToolchainInfo.plist` into the toolchain distribution to associate an identifier with the toolchain for ease of working with parallel installations.
1 parent c7732c5 commit 25805e0

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

platforms/Windows/bld/bld.wxs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,12 @@
493493
<?endif?>
494494
</ComponentGroup>
495495

496+
<ComponentGroup Id="Configuration">
497+
<Component Directory="ToolchainsVersioned">
498+
<File Source="$(TOOLCHAIN_ROOT)\ToolchainInfo.plist" />
499+
</Component>
500+
</ComponentGroup>
501+
496502
<ComponentGroup Id="EnvironmentVariables">
497503
<Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="_usr_bin" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
498504
<Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[_usr_bin]" />
@@ -523,6 +529,7 @@
523529
<ComponentGroupRef Id="ClangResources" />
524530
<ComponentGroupRef Id="SwiftClangResources" />
525531

532+
<ComponentGroupRef Id="Configuration" />
526533
<ComponentGroupRef Id="EnvironmentVariables" />
527534
<ComponentGroupRef Id="VersionedDirectoryCleanup" />
528535
</Feature>

0 commit comments

Comments
 (0)