From 6bb3adfb12d25a1cec613cd85d553bf79d5e5ad5 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Tue, 6 Jun 2023 09:37:57 -0700
Subject: [PATCH 1/2] WiX: package RegexBuilder into the Windows distribution

We were previously missing the RegexBuilder module in the SDK
distribution.  Package this up as it should be available on Windows.
Add the runtime component to the runtime MSI as well.
---
 platforms/Windows/rtl/lib/rtllib.wxs |  3 +++
 platforms/Windows/sdk/sdk.wxs        | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/platforms/Windows/rtl/lib/rtllib.wxs b/platforms/Windows/rtl/lib/rtllib.wxs
index 628017e9..cf41eb97 100644
--- a/platforms/Windows/rtl/lib/rtllib.wxs
+++ b/platforms/Windows/rtl/lib/rtllib.wxs
@@ -20,6 +20,9 @@
       <Component>
         <File Source="$(SDK_ROOT)\usr\bin\swiftDistributed.dll" />
       </Component>
+      <Component>
+        <File Source="$(SDK_ROOT)\usr\bin\swiftRegexBuilder.dll" />
+      </Component>
       <Component>
         <File Source="$(SDK_ROOT)\usr\bin\swift_RegexParser.dll" />
       </Component>
diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs
index 1ec91cd2..40c5e2de 100644
--- a/platforms/Windows/sdk/sdk.wxs
+++ b/platforms/Windows/sdk/sdk.wxs
@@ -92,6 +92,7 @@
                       <Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule" />
                       <Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule" />
                       <Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule" />
+                      <Directory Id="RegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
                       <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
                       <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
                       <Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule" />
@@ -377,6 +378,21 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="RegexBuilder" Directory="RegexBuilder.swiftmodule">
+      <Component>
+        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(ArchTriple).swiftdoc" />
+      </Component>
+      <Component>
+        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(ArchTriple).swiftinterface" />
+      </Component>
+      <Component>
+        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(ArchTriple).swiftmodule" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
+        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\swiftRegexBuilder.lib" />
+      </Component>
+    </ComponentGroup>
+
     <ComponentGroup Id="Swift" Directory="Swift.swiftmodule">
       <Component>
         <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(ArchTriple).swiftdoc" />
@@ -502,6 +518,7 @@
       <ComponentGroupRef Id="Foundation" />
       <ComponentGroupRef Id="FoundationXML" />
       <ComponentGroupRef Id="FoundationNetworking" />
+      <ComponentGroupRef Id="RegexBuilder" />
       <ComponentGroupRef Id="Swift" />
       <ComponentGroupRef Id="SwiftOnoneSupport" />
       <ComponentGroupRef Id="WinSDK" />

From 34420b7d8f8a6c758a3b1d3c035cbf1ed79f3c8b Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Wed, 30 Aug 2023 21:41:37 -0700
Subject: [PATCH 2/2] WiX: package Observable into the distribution

Include the Observable module in the SDK and runtime.  Additionally,
include the observable macros for the toolchain into the build tools.
---
 platforms/Windows/bld/bld.wxs        |  7 +++++++
 platforms/Windows/rtl/lib/rtllib.wxs |  3 +++
 platforms/Windows/sdk/sdk.wxs        | 17 +++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
index 6e680b1b..f80be619 100644
--- a/platforms/Windows/bld/bld.wxs
+++ b/platforms/Windows/bld/bld.wxs
@@ -293,6 +293,12 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="SwiftMacros" Directory="_usr_bin">
+      <Component>
+        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\ObservationMacros.dll" />
+      </Component>
+    </ComponentGroup>
+
     <ComponentGroup Id="argument_parser" Directory="_usr_bin">
       <Component>
         <File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
@@ -383,6 +389,7 @@
       <ComponentGroupRef Id="tools_support_core" />
       <ComponentGroupRef Id="swift_driver" />
       <ComponentGroupRef Id="swift_syntax" />
+      <ComponentGroupRef Id="SwiftMacros" />
 
       <ComponentGroupRef Id="ClangResources" />
 
diff --git a/platforms/Windows/rtl/lib/rtllib.wxs b/platforms/Windows/rtl/lib/rtllib.wxs
index cf41eb97..7d0062a9 100644
--- a/platforms/Windows/rtl/lib/rtllib.wxs
+++ b/platforms/Windows/rtl/lib/rtllib.wxs
@@ -41,6 +41,9 @@
       <Component>
         <File Source="$(SDK_ROOT)\usr\bin\swiftCRT.dll" />
       </Component>
+      <Component>
+        <File Source="$(SDK_ROOT)\usr\bin\swiftObservation.dll" />
+      </Component>
       <Component>
         <File Source="$(SDK_ROOT)\usr\bin\swiftRemoteMirror.dll" />
       </Component>
diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/sdk.wxs
index 40c5e2de..885f0853 100644
--- a/platforms/Windows/sdk/sdk.wxs
+++ b/platforms/Windows/sdk/sdk.wxs
@@ -92,6 +92,7 @@
                       <Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule" />
                       <Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule" />
                       <Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule" />
+                      <Directory Id="Observation.swiftmodule" Name="Observation.swiftmodule" />
                       <Directory Id="RegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
                       <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
                       <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
@@ -378,6 +379,21 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="Observation" Directory="Observation.swiftmodule">
+      <Component>
+        <File Name="$(ArchTriple).swiftdoc" Source="$(SDK_ROOT)\usr\lib\swift\windows\Observation.swiftmodule\$(ArchTriple).swiftdoc" />
+      </Component>
+      <Component>
+        <File Name="$(ArchTriple).swiftinterface" Source="$(SDK_ROOT)\usr\lib\swift\windows\Observation.swiftmodule\$(ArchTriple).swiftinterface" />
+      </Component>
+      <Component>
+        <File Name="$(ArchTriple).swiftmodule" Source="$(SDK_ROOT)\usr\lib\swift\windows\Observation.swiftmodule\$(ArchTriple).swiftmodule" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
+        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\swiftObservation.lib" />
+      </Component>
+    </ComponentGroup>
+
     <ComponentGroup Id="RegexBuilder" Directory="RegexBuilder.swiftmodule">
       <Component>
         <File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(ArchTriple).swiftdoc" />
@@ -518,6 +534,7 @@
       <ComponentGroupRef Id="Foundation" />
       <ComponentGroupRef Id="FoundationXML" />
       <ComponentGroupRef Id="FoundationNetworking" />
+      <ComponentGroupRef Id="Observation" />
       <ComponentGroupRef Id="RegexBuilder" />
       <ComponentGroupRef Id="Swift" />
       <ComponentGroupRef Id="SwiftOnoneSupport" />