Skip to content

Commit 0932d6b

Browse files
committed
WiX: extract Testing Macros into a component (NFC)
Extract the testing macros into their own component group. Each repository is currently setup into a single component group that we then enumerate into the install image. This follows suit for the testing macros.
1 parent f40c1ae commit 0932d6b

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

platforms/Windows/bld/bld.wxs

+7-3
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,6 @@
336336
<Component>
337337
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftMacros.dll" />
338338
</Component>
339-
<Component>
340-
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
341-
</Component>
342339
</ComponentGroup>
343340

344341
<ComponentGroup Id="FoundationMacros" Directory="_usr_bin">
@@ -347,6 +344,12 @@
347344
</Component>
348345
</ComponentGroup>
349346

347+
<ComponentGroup Id="TestingMacros" Directory="_usr_bin">
348+
<Component>
349+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
350+
</Component>
351+
</ComponentGroup>
352+
350353
<ComponentGroup Id="argument_parser" Directory="_usr_bin">
351354
<Component>
352355
<File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
@@ -500,6 +503,7 @@
500503
<ComponentGroupRef Id="plugin_server" />
501504
<ComponentGroupRef Id="SwiftMacros" />
502505
<ComponentGroupRef Id="FoundationMacros" />
506+
<ComponentGroupRef Id="TestingMacros" />
503507

504508
<ComponentGroupRef Id="ClangResources" />
505509

0 commit comments

Comments
 (0)