Skip to content

Commit ce164d3

Browse files
compnerdcompnerd
committed
WiX: package up _MatchingEngine
Although we packaged up `_StringProcessing`, we left out `_MatchingEngine`. This adjusts the manifest to include that as well.
1 parent 8a32452 commit ce164d3

File tree

4 files changed

+26
-0
lines changed

4 files changed

+26
-0
lines changed

‎platforms/Windows/runtime-amd64.wxs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<File Id="swift_Concurrency.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.dll" Checksum="yes" />
3737
<File Id="swift_Differentiation.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.dll" Checksum="yes" />
3838
<File Id="swiftDistributed.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.dll" Checksum="yes" />
39+
<File Id="swift_MatchingEngine.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_MatchingEngine.dll" Checksum="yes" />
3940
<File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" />
4041
<File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
4142
<File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
@@ -60,6 +61,7 @@
6061
<File Id="swift_Concurrency.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.pdb" Checksum="yes" DiskId="2" />
6162
<File Id="swift_Differentiation.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.pdb" Checksum="yes" DiskId="2" />
6263
<File Id="swiftDistributed.pdb" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.pdb" Checksum="yes" DiskId="2" />
64+
<File Id="swift_MatchingEngine.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_MatchingEngine.pdb" Checksum="yes" DiskId="2" />
6365
<File Id="swift_StringProcessing.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.pdb" Checksum="yes" DiskId="2" />
6466
<File Id="swiftCore.pdb" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.pdb" Checksum="yes" DiskId="2" />
6567
<File Id="swiftDispatch.pdb" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.pdb" Checksum="yes" DiskId="2" />

‎platforms/Windows/runtime-x86.wxs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<File Id="swift_Concurrency.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.dll" Checksum="yes" />
3636
<File Id="swift_Differentiation.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.dll" Checksum="yes" />
3737
<File Id="swiftDistributed.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.dll" Checksum="yes" />
38+
<File Id="swift_MatchingEngine.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_MatchingEngine.dll" Checksum="yes" />
3839
<File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" />
3940
<File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
4041
<File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
@@ -59,6 +60,7 @@
5960
<File Id="swift_Concurrency.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.pdb" Checksum="yes" DiskId="2" />
6061
<File Id="swift_Differentiation.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.pdb" Checksum="yes" DiskId="2" />
6162
<File Id="swiftDistributed.pdb" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.pdb" Checksum="yes" DiskId="2" />
63+
<File Id="swift_MatchingEngine.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_MatchingEngine.pdb" Checksum="yes" DiskId="2" />
6264
<File Id="swift_StringProcessing.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.pdb" Checksum="yes" DiskId="2" />
6365
<File Id="swiftCore.pdb" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.pdb" Checksum="yes" DiskId="2" />
6466
<File Id="swiftDispatch.pdb" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.pdb" Checksum="yes" DiskId="2" />

‎platforms/Windows/sdk-amd64.wxs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
</Directory>
7070
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
7171
</Directory>
72+
<Directory Id="_MatchingEngine.swiftmodule" Name="_MatchingEngine.swiftmodule">
73+
</Directory>
7274
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
7375
</Directory>
7476
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
@@ -199,6 +201,14 @@
199201
</Component>
200202
</DirectoryRef>
201203

204+
<DirectoryRef Id="_MatchingEngine.swiftmodule">
205+
<Component Id="_MatchingEngine.swiftmodule" Guid="44e30ebc-57c0-4531-9756-7d30583f5c11">
206+
<File Id="_MatchingEngine.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_MatchingEngine.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
207+
<File Id="_MatchingEngine.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_MatchingEngine.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
208+
<File Id="_MatchingEngine.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_MatchingEngine.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
209+
</Component>
210+
</DirectoryRef>
211+
202212
<DirectoryRef Id="_StringProcessing.swiftmodule">
203213
<Component Id="_StringProcessing.swiftmodule" Guid="6baa3833-10a9-4df3-a568-241791d13449">
204214
<File Id="_StringProcessing.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
@@ -358,6 +368,7 @@
358368
<ComponentRef Id="_Concurrency.swiftmodule" />
359369
<ComponentRef Id="_Differentiation.swiftmodule" />
360370
<ComponentRef Id="Distributed.swiftmodule" />
371+
<ComponentRef Id="_MatchingEngine.swiftmodule" />
361372
<ComponentRef Id="_StringProcessing.swiftmodule" />
362373
<ComponentRef Id="CRT.swiftmodule" />
363374
<ComponentRef Id="Dispatch.swiftmodule" />

‎platforms/Windows/sdk-x86.wxs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
</Directory>
7070
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
7171
</Directory>
72+
<Directory Id="_MatchingEngine.swiftmodule" Name="_MatchingEngine.swiftmodule">
73+
</Directory>
7274
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
7375
</Directory>
7476
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
@@ -199,6 +201,14 @@
199201
</Component>
200202
</DirectoryRef>
201203

204+
<DirectoryRef Id="_MatchingEngine.swiftmodule">
205+
<Component Id="_MatchingEngine.swiftmodule" Guid="db814242-ca96-481d-9b5f-f2590e8a0c5b">
206+
<File Id="_MatchingEngine.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_MatchingEngine.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
207+
<File Id="_MatchingEngine.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_MatchingEngine.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
208+
<File Id="_MatchingEngine.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_MatchingEngine.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
209+
</Component>
210+
</DirectoryRef>
211+
202212
<DirectoryRef Id="_StringProcessing.swiftmodule">
203213
<Component Id="_StringProcessing.swiftmodule" Guid="db814242-ca96-481d-9b5f-f2590e8a0c5b">
204214
<File Id="_StringProcessing.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
@@ -352,6 +362,7 @@
352362
<ComponentRef Id="_Concurrency.swiftmodule" />
353363
<ComponentRef Id="_Differentiation.swiftmodule" />
354364
<ComponentRef Id="Distributed.swiftmodule" />
365+
<ComponentRef Id="_MatchingEngine.swiftmodule" />
355366
<ComponentRef Id="_StringProcessing.swiftmodule" />
356367
<ComponentRef Id="CRT.swiftmodule" />
357368
<ComponentRef Id="Dispatch.swiftmodule" />

0 commit comments

Comments
 (0)