Skip to content

Commit fbc2f18

Browse files
compnerdrintaro
authored andcommitted
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. (cherry picked from commit 0932d6b)
1 parent 48bd486 commit fbc2f18

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

platforms/Windows/bld/bld.wxs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,6 @@
324324
<Component>
325325
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftMacros.dll" />
326326
</Component>
327-
<Component>
328-
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
329-
</Component>
330327
</ComponentGroup>
331328

332329
<ComponentGroup Id="FoundationMacros" Directory="_usr_bin">
@@ -335,6 +332,12 @@
335332
</Component>
336333
</ComponentGroup>
337334

335+
<ComponentGroup Id="TestingMacros" Directory="_usr_bin">
336+
<Component>
337+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
338+
</Component>
339+
</ComponentGroup>
340+
338341
<ComponentGroup Id="argument_parser" Directory="_usr_bin">
339342
<Component>
340343
<File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
@@ -435,6 +438,7 @@
435438
<ComponentGroupRef Id="swift_syntax" />
436439
<ComponentGroupRef Id="SwiftMacros" />
437440
<ComponentGroupRef Id="FoundationMacros" />
441+
<ComponentGroupRef Id="TestingMacros" />
438442

439443
<ComponentGroupRef Id="ClangResources" />
440444

0 commit comments

Comments
 (0)