From e5b5f885868e7bf6d49eab857b8c92544dd7501f Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Mon, 19 Aug 2024 09:19:52 -0700
Subject: [PATCH] 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.
---
 platforms/Windows/bld/bld.wxs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
index e45273f1..9fc0a83a 100644
--- a/platforms/Windows/bld/bld.wxs
+++ b/platforms/Windows/bld/bld.wxs
@@ -336,9 +336,6 @@
       <Component>
         <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftMacros.dll" />
       </Component>
-      <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
-      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="FoundationMacros" Directory="_usr_bin">
@@ -347,6 +344,12 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="TestingMacros" Directory="_usr_bin">
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
+      </Component>
+    </ComponentGroup>
+
     <ComponentGroup Id="argument_parser" Directory="_usr_bin">
       <Component>
         <File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
@@ -500,6 +503,7 @@
       <ComponentGroupRef Id="plugin_server" />
       <ComponentGroupRef Id="SwiftMacros" />
       <ComponentGroupRef Id="FoundationMacros" />
+      <ComponentGroupRef Id="TestingMacros" />
 
       <ComponentGroupRef Id="ClangResources" />