Skip to content

Commit 5f8b57f

Browse files
shahmishalshahmishal
authored
Merge pull request #106 from apple/rename-matchingengine
Rename _MatchingEngine to _RegexParser.
2 parents ce164d3 + b08a656 commit 5f8b57f

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎platforms/Windows/runtime-amd64.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +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" />
39+
<File Id="swift_RegexParser.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.dll" Checksum="yes" />
4040
<File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" />
4141
<File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
4242
<File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
@@ -61,7 +61,7 @@
6161
<File Id="swift_Concurrency.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.pdb" Checksum="yes" DiskId="2" />
6262
<File Id="swift_Differentiation.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.pdb" Checksum="yes" DiskId="2" />
6363
<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" />
64+
<File Id="swift_RegexParser.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.pdb" Checksum="yes" DiskId="2" />
6565
<File Id="swift_StringProcessing.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.pdb" Checksum="yes" DiskId="2" />
6666
<File Id="swiftCore.pdb" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.pdb" Checksum="yes" DiskId="2" />
6767
<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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +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" />
38+
<File Id="swift_RegexParser.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.dll" Checksum="yes" />
3939
<File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" />
4040
<File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
4141
<File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
@@ -60,7 +60,7 @@
6060
<File Id="swift_Concurrency.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.pdb" Checksum="yes" DiskId="2" />
6161
<File Id="swift_Differentiation.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.pdb" Checksum="yes" DiskId="2" />
6262
<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" />
63+
<File Id="swift_RegexParser.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.pdb" Checksum="yes" DiskId="2" />
6464
<File Id="swift_StringProcessing.pdb" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.pdb" Checksum="yes" DiskId="2" />
6565
<File Id="swiftCore.pdb" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.pdb" Checksum="yes" DiskId="2" />
6666
<File Id="swiftDispatch.pdb" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.pdb" Checksum="yes" DiskId="2" />

‎platforms/Windows/sdk-amd64.wxs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</Directory>
7070
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
7171
</Directory>
72-
<Directory Id="_MatchingEngine.swiftmodule" Name="_MatchingEngine.swiftmodule">
72+
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
7373
</Directory>
7474
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
7575
</Directory>
@@ -201,11 +201,11 @@
201201
</Component>
202202
</DirectoryRef>
203203

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" />
204+
<DirectoryRef Id="_RegexParser.swiftmodule">
205+
<Component Id="_RegexParser.swiftmodule" Guid="44e30ebc-57c0-4531-9756-7d30583f5c11">
206+
<File Id="_RegexParser.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
207+
<File Id="_RegexParser.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
208+
<File Id="_RegexParser.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
209209
</Component>
210210
</DirectoryRef>
211211

@@ -368,7 +368,7 @@
368368
<ComponentRef Id="_Concurrency.swiftmodule" />
369369
<ComponentRef Id="_Differentiation.swiftmodule" />
370370
<ComponentRef Id="Distributed.swiftmodule" />
371-
<ComponentRef Id="_MatchingEngine.swiftmodule" />
371+
<ComponentRef Id="_RegexParser.swiftmodule" />
372372
<ComponentRef Id="_StringProcessing.swiftmodule" />
373373
<ComponentRef Id="CRT.swiftmodule" />
374374
<ComponentRef Id="Dispatch.swiftmodule" />

‎platforms/Windows/sdk-x86.wxs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</Directory>
7070
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
7171
</Directory>
72-
<Directory Id="_MatchingEngine.swiftmodule" Name="_MatchingEngine.swiftmodule">
72+
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
7373
</Directory>
7474
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
7575
</Directory>
@@ -201,11 +201,11 @@
201201
</Component>
202202
</DirectoryRef>
203203

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" />
204+
<DirectoryRef Id="_RegexParser.swiftmodule">
205+
<Component Id="_RegexParser.swiftmodule" Guid="db814242-ca96-481d-9b5f-f2590e8a0c5b">
206+
<File Id="_RegexParser.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
207+
<File Id="_RegexParser.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
208+
<File Id="_RegexParser.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
209209
</Component>
210210
</DirectoryRef>
211211

@@ -362,7 +362,7 @@
362362
<ComponentRef Id="_Concurrency.swiftmodule" />
363363
<ComponentRef Id="_Differentiation.swiftmodule" />
364364
<ComponentRef Id="Distributed.swiftmodule" />
365-
<ComponentRef Id="_MatchingEngine.swiftmodule" />
365+
<ComponentRef Id="_RegexParser.swiftmodule" />
366366
<ComponentRef Id="_StringProcessing.swiftmodule" />
367367
<ComponentRef Id="CRT.swiftmodule" />
368368
<ComponentRef Id="Dispatch.swiftmodule" />

0 commit comments

Comments
 (0)