Skip to content

Commit 76e6067

Browse files
committed
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.
1 parent 69fdd5b commit 76e6067

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

platforms/Windows/bld/bld.wxs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,12 @@
293293
</Component>
294294
</ComponentGroup>
295295

296+
<ComponentGroup Id="SwiftMacros" Directory="_usr_bin">
297+
<Component>
298+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\ObservationMacros.dll" />
299+
</Component>
300+
</ComponentGroup>
301+
296302
<ComponentGroup Id="argument_parser" Directory="_usr_bin">
297303
<Component>
298304
<File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
@@ -383,6 +389,7 @@
383389
<ComponentGroupRef Id="tools_support_core" />
384390
<ComponentGroupRef Id="swift_driver" />
385391
<ComponentGroupRef Id="swift_syntax" />
392+
<ComponentGroupRef Id="SwiftMacros" />
386393

387394
<ComponentGroupRef Id="ClangResources" />
388395

platforms/Windows/rtl/lib/rtllib.wxs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
<Component>
4242
<File Source="$(SDK_ROOT)\usr\bin\swiftCRT.dll" />
4343
</Component>
44+
<Component>
45+
<File Source="$(SDK_ROOT)\usr\bin\swiftObservation.dll" />
46+
</Component>
4447
<Component>
4548
<File Source="$(SDK_ROOT)\usr\bin\swiftRemoteMirror.dll" />
4649
</Component>

platforms/Windows/sdk/sdk.wxs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule" />
9393
<Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule" />
9494
<Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule" />
95+
<Directory Id="Observation.swiftmodule" Name="Observation.swiftmodule" />
9596
<Directory Id="RegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
9697
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
9798
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
@@ -378,6 +379,21 @@
378379
</Component>
379380
</ComponentGroup>
380381

382+
<ComponentGroup Id="Observation" Directory="Observation.swiftmodule">
383+
<Component>
384+
<File Name="$(ArchTriple).swiftdoc" Source="$(SDK_ROOT)\usr\lib\swift\windows\Observation.swiftmodule\$(ArchTriple).swiftdoc" />
385+
</Component>
386+
<Component>
387+
<File Name="$(ArchTriple).swiftinterface" Source="$(SDK_ROOT)\usr\lib\swift\windows\Observation.swiftmodule\$(ArchTriple).swiftinterface" />
388+
</Component>
389+
<Component>
390+
<File Name="$(ArchTriple).swiftmodule" Source="$(SDK_ROOT)\usr\lib\swift\windows\Observation.swiftmodule\$(ArchTriple).swiftmodule" />
391+
</Component>
392+
<Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
393+
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\swiftObservation.lib" />
394+
</Component>
395+
</ComponentGroup>
396+
381397
<ComponentGroup Id="RegexBuilder" Directory="RegexBuilder.swiftmodule">
382398
<Component>
383399
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(ArchTriple).swiftdoc" />
@@ -518,6 +534,7 @@
518534
<ComponentGroupRef Id="Foundation" />
519535
<ComponentGroupRef Id="FoundationXML" />
520536
<ComponentGroupRef Id="FoundationNetworking" />
537+
<ComponentGroupRef Id="Observation" />
521538
<ComponentGroupRef Id="RegexBuilder" />
522539
<ComponentGroupRef Id="Swift" />
523540
<ComponentGroupRef Id="SwiftOnoneSupport" />

0 commit comments

Comments
 (0)