Skip to content

Commit 3ace1e0

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 77bb234 commit 3ace1e0

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

platforms/Windows/runtime.wxs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<Component Id="swiftDistributed.dll">
4141
<File Id="swiftDistributed.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.dll" Checksum="yes" />
4242
</Component>
43+
<Component Id="swiftRegexBuilder.dll">
44+
<File Id="swiftRegexBuilder.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftRegexBuilder.dll" Checksum="yes" />
45+
</Component>
4346
<Component Id="swift_RegexParser.dll">
4447
<File Id="swift_RegexParser.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.dll" Checksum="yes" />
4548
</Component>
@@ -103,6 +106,7 @@
103106
<!-- <ComponentRef Id="swiftDemangle.dll" /> -->
104107
<ComponentRef Id="swiftDispatch.dll" />
105108
<ComponentRef Id="swiftDistributed.dll" />
109+
<ComponentRef Id="swiftRegexBuilder.dll" />
106110
<ComponentRef Id="swiftRemoteMirror.dll" />
107111
<ComponentRef Id="swiftSwiftOnoneSupport.dll" />
108112
<ComponentRef Id="swiftWinSDK.dll" />

platforms/Windows/sdk.wxs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,18 @@
292292
</Component>
293293
</Directory>
294294

295+
<Directory Id="RegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule">
296+
<Component Id="RegexBuilder.swiftdoc">
297+
<File Id="RegexBuilder.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
298+
</Component>
299+
<Component Id="RegexBuilder.swiftinterface">
300+
<File Id="RegexBuilder.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
301+
</Component>
302+
<Component Id="RegexBuilder.swiftmodule">
303+
<File Id="RegexBuilder.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
304+
</Component>
305+
</Directory>
306+
295307
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
296308
<Component Id="Swift.swiftdoc">
297309
<File Id="Swift.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
@@ -388,6 +400,10 @@
388400
<File Id="swiftCore.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftCore.lib" Checksum="yes" />
389401
</Component>
390402

403+
<Component Id="swiftRegexBuilder.lib">
404+
<File Id="swiftRegexBuilder.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftRegexBuilder.lib" Checksum="yes" />
405+
</Component>
406+
391407
<Component Id="swiftSwiftOnoneSupport.lib">
392408
<File Id="swiftSwiftOnoneSupport.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftSwiftOnoneSupport.lib" Checksum="yes" />
393409
</Component>
@@ -560,6 +576,13 @@
560576

561577
<ComponentRef Id="FoundationXML.lib" />
562578

579+
<!-- RegexBuilder -->
580+
<ComponentRef Id="RegexBuilder.swiftdoc" />
581+
<ComponentRef Id="RegexBuilder.swiftinterface" />
582+
<ComponentRef Id="RegexBuilder.swiftmodule" />
583+
584+
<ComponentRef Id="swiftRegexBuilder.lib" />
585+
563586
<!-- Swift -->
564587
<ComponentRef Id="Swift.swiftdoc" />
565588
<ComponentRef Id="Swift.swiftinterface" />

0 commit comments

Comments
 (0)