Skip to content

Commit 30bfddd

Browse files
committed
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.
1 parent 4b1efc8 commit 30bfddd

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

platforms/Windows/rtl/lib/rtllib.wxs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<Component>
2121
<File Source="$(SDK_ROOT)\usr\bin\swiftDistributed.dll" />
2222
</Component>
23+
<Component>
24+
<File Source="$(SDK_ROOT)\usr\bin\swiftRegexBuilder.dll" />
25+
</Component>
2326
<Component>
2427
<File Source="$(SDK_ROOT)\usr\bin\swift_RegexParser.dll" />
2528
</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="RegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
9596
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
9697
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
9798
<Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule" />
@@ -371,6 +372,21 @@
371372
</Component>
372373
</ComponentGroup>
373374

375+
<ComponentGroup Id="RegexBuilder" Directory="RegexBuilder.swiftmodule">
376+
<Component>
377+
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(ArchTriple).swiftdoc" />
378+
</Component>
379+
<Component>
380+
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(ArchTriple).swiftinterface" />
381+
</Component>
382+
<Component>
383+
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(ArchTriple).swiftmodule" />
384+
</Component>
385+
<Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
386+
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(ArchArchDir)\swiftRegexBuilder.lib" />
387+
</Component>
388+
</ComponentGroup>
389+
374390
<ComponentGroup Id="Swift" Directory="Swift.swiftmodule">
375391
<Component>
376392
<File Source="$(SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(ArchTriple).swiftdoc" />
@@ -496,6 +512,7 @@
496512
<ComponentGroupRef Id="Foundation" />
497513
<ComponentGroupRef Id="FoundationXML" />
498514
<ComponentGroupRef Id="FoundationNetworking" />
515+
<ComponentGroupRef Id="RegexBuilder" />
499516
<ComponentGroupRef Id="Swift" />
500517
<ComponentGroupRef Id="SwiftOnoneSupport" />
501518
<ComponentGroupRef Id="WinSDK" />

0 commit comments

Comments
 (0)