Skip to content

Commit ca4bc79

Browse files
compnerdcompnerd
committed
WiX: add Testing cross-module overlay to the distribution
Package the cross module overlay for Testing into the distribution on Windows for Windows and Android SDKs.
1 parent e082237 commit ca4bc79

File tree

2 files changed

+104
-1
lines changed

2 files changed

+104
-1
lines changed

‎platforms/Windows/platforms/android/android.wxs‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<Directory Name="lib">
7979
<Directory Name="swift">
8080
<Directory Name="android">
81+
<Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
8182
<?if $(IncludeARM64) = True?>
8283
<Directory Id="Testing_usr_lib_swift_android_arm64" Name="aarch64" DiskId="2" />
8384
<?endif?>
@@ -90,6 +91,7 @@
9091
<?if $(IncludeX86) = True?>
9192
<Directory Id="Testing_usr_lib_swift_android_x86" Name="i686" DiskId="5" />
9293
<?endif?>
94+
<Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
9395
<Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
9496
</Directory>
9597
</Directory>
@@ -230,6 +232,11 @@
230232
<?endif?>
231233

232234
<!-- Testing -->
235+
<ComponentGroup Id="Testing">
236+
<Component Directory="Testing.swiftcrossimport">
237+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftcrossimport\Foundation.swiftoverlay" />
238+
</Component>
239+
</ComponentGroup>
233240
<?if $(IncludeARM64) = True?>
234241
<ComponentGroup Id="Testing.arm64">
235242
<Component Directory="Testing.swiftmodule" DiskId="2">
@@ -239,9 +246,19 @@
239246
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
240247
</Component>
241248

249+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
250+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
251+
</Component>
252+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
253+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
254+
</Component>
255+
242256
<Component Directory="Testing_usr_lib_swift_android_arm64" DiskId="2">
243257
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\libTesting.so" />
244258
</Component>
259+
<Component Directory="Testing_usr_lib_swift_android_arm64" DiskId="2">
260+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\lib_Testing_Foundation.so" />
261+
</Component>
245262
</ComponentGroup>
246263
<?endif?>
247264
<?if $(IncludeARM) = True?>
@@ -253,9 +270,19 @@
253270
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
254271
</Component>
255272

273+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
274+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
275+
</Component>
276+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
277+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
278+
</Component>
279+
256280
<Component Directory="Testing_usr_lib_swift_android_arm" DiskId="3">
257281
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\libTesting.so" />
258282
</Component>
283+
<Component Directory="Testing_usr_lib_swift_android_arm" DiskId="3">
284+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\lib_Testing_Foundation.so" />
285+
</Component>
259286
</ComponentGroup>
260287
<?endif?>
261288
<?if $(IncludeX64) = True?>
@@ -267,9 +294,19 @@
267294
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
268295
</Component>
269296

297+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
298+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
299+
</Component>
300+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
301+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
302+
</Component>
303+
270304
<Component Directory="Testing_usr_lib_swift_android_x64" DiskId="4">
271305
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\libTesting.so" />
272306
</Component>
307+
<Component Directory="Testing_usr_lib_swift_android_x64" DiskId="4">
308+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\lib_Testing_Foundation.so" />
309+
</Component>
273310
</ComponentGroup>
274311
<?endif?>
275312
<?if $(IncludeX86) = True?>
@@ -281,9 +318,19 @@
281318
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\i686-unknown-linux-android.swiftinterface" />
282319
</Component>
283320

284-
<Component Directory="Testing.swiftmodule" DiskId="5">
321+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="5">
322+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
323+
</Component>
324+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="5">
325+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\i686-unknown-linux-android.swiftinterface" />
326+
</Component>
327+
328+
<Component Directory="Testing_usr_lib_swift_android_x86" DiskId="5">
285329
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\libTesting.so" />
286330
</Component>
331+
<Component Directory="Testing_usr_lib_swift_android_x86" DiskId="5">
332+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\lib_Testing_Foundation.so" />
333+
</Component>
287334
</ComponentGroup>
288335
<?endif?>
289336

@@ -2092,6 +2139,8 @@
20922139
<ComponentGroupRef Id="_FoundationUnicode" />
20932140
<ComponentGroupRef Id="_FoundationCShims" />
20942141

2142+
<ComponentGroupRef Id="Testing" />
2143+
20952144
<ComponentGroupRef Id="Configuration" />
20962145
<ComponentGroupRef Id="SwiftShims" />
20972146
<ComponentGroupRef Id="apinotes" />

‎platforms/Windows/platforms/windows/windows.wxs‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<Directory Name="lib">
9090
<Directory Name="swift">
9191
<Directory Name="windows">
92+
<Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
9293
<?if $(IncludeARM64) = True?>
9394
<Directory DiskId="2" Id="Testing_usr_lib_swift_windows_arm64" Name="aarch64" />
9495
<?endif?>
@@ -98,6 +99,7 @@
9899
<?if $(IncludeX86) = True?>
99100
<Directory DiskId="4" Id="Testing_usr_lib_swift_windows_x86" Name="i686" />
100101
<?endif?>
102+
<Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
101103
<Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
102104
</Directory>
103105
</Directory>
@@ -222,52 +224,102 @@
222224
<?endif?>
223225

224226
<!-- Testing -->
227+
<ComponentGroup Id="Testing">
228+
<Component Directory="Testing.swiftcrossimport">
229+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
230+
</Component>
231+
</ComponentGroup>
225232
<?if $(IncludeARM64) = True?>
226233
<ComponentGroup Id="Testing.arm64">
227234
<Component Directory="Testing_usr_bin64a" DiskId="2">
228235
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\Testing.dll" />
229236
</Component>
237+
<Component Directory="Testing_usr_bin64a" DiskId="2">
238+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_Foundation.dll" />
239+
</Component>
240+
230241
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
231242
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\Testing.lib" />
232243
</Component>
244+
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
245+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_Foundation.lib" />
246+
</Component>
247+
233248
<Component Directory="Testing.swiftmodule" DiskId="2">
234249
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
235250
</Component>
236251
<Component Directory="Testing.swiftmodule" DiskId="2">
237252
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
238253
</Component>
254+
255+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
256+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
257+
</Component>
258+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
259+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
260+
</Component>
239261
</ComponentGroup>
240262
<?endif?>
241263
<?if $(IncludeX64) = True?>
242264
<ComponentGroup Id="Testing.x64">
243265
<Component Directory="Testing_usr_bin64" DiskId="3">
244266
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\Testing.dll" />
245267
</Component>
268+
<Component Directory="Testing_usr_bin64" DiskId="3">
269+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_Foundation.dll" />
270+
</Component>
271+
246272
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
247273
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\Testing.lib" />
248274
</Component>
275+
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
276+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_Foundation.lib" />
277+
</Component>
278+
249279
<Component Directory="Testing.swiftmodule" DiskId="3">
250280
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
251281
</Component>
252282
<Component Directory="Testing.swiftmodule" DiskId="3">
253283
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
254284
</Component>
285+
286+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
287+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
288+
</Component>
289+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
290+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
291+
</Component>
255292
</ComponentGroup>
256293
<?endif?>
257294
<?if $(IncludeX86) = True?>
258295
<ComponentGroup Id="Testing.x86">
259296
<Component Directory="Testing_usr_bin32" DiskId="4">
260297
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\Testing.dll" />
261298
</Component>
299+
<Component Directory="Testing_usr_bin32" DiskId="4">
300+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_Foundation.dll" />
301+
</Component>
302+
262303
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
263304
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\Testing.lib" />
264305
</Component>
306+
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
307+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_Foundation.lib" />
308+
</Component>
309+
265310
<Component Directory="Testing.swiftmodule" DiskId="4">
266311
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
267312
</Component>
268313
<Component Directory="Testing.swiftmodule" DiskId="4">
269314
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
270315
</Component>
316+
317+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
318+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
319+
</Component>
320+
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
321+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
322+
</Component>
271323
</ComponentGroup>
272324
<?endif?>
273325

@@ -1666,6 +1718,8 @@
16661718
<ComponentGroupRef Id="_FoundationUnicode" />
16671719
<ComponentGroupRef Id="_FoundationCShims" />
16681720

1721+
<ComponentGroupRef Id="Testing" />
1722+
16691723
<ComponentGroupRef Id="AuxiliaryFiles" />
16701724
<ComponentGroupRef Id="Configuration" />
16711725
<ComponentGroupRef Id="SwiftShims" />

0 commit comments

Comments
 (0)