Skip to content

Commit 16bd29c

Browse files
grynspangrynspan
committed
WiX: Add the Testing/WinSDK cross-import overlay
Adds the files generated by swiftlang/swift-testing#1296. See also #403 for reference.
1 parent 319625c commit 16bd29c

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<Directory Name="swift">
9797
<Directory Name="windows">
9898
<Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
99+
<Directory Id="_Testing_WinSDK.swiftmodule" Name="_Testing_WinSDK.swiftmodule" />
99100
<?if $(IncludeARM64) = True?>
100101
<Directory DiskId="2" Id="Testing_usr_lib_swift_windows_arm64" Name="aarch64" />
101102
<?endif?>
@@ -326,6 +327,7 @@
326327
<ComponentGroup Id="Testing">
327328
<Component Directory="Testing.swiftcrossimport">
328329
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
330+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\WinSDK.swiftoverlay" />
329331
</Component>
330332
</ComponentGroup>
331333
<?if $(IncludeARM64) = True?>
@@ -335,13 +337,15 @@
335337
</Component>
336338
<Component Directory="Testing_usr_bin64a" DiskId="2">
337339
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_Foundation.dll" />
340+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_WinSDK.dll" />
338341
</Component>
339342

340343
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
341344
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\Testing.lib" />
342345
</Component>
343346
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
344347
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_Foundation.lib" />
348+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_WinSDK.lib" />
345349
</Component>
346350

347351
<Component Directory="Testing.swiftmodule" DiskId="2">
@@ -357,6 +361,13 @@
357361
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
358362
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
359363
</Component>
364+
365+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="2">
366+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
367+
</Component>
368+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="2">
369+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
370+
</Component>
360371
</ComponentGroup>
361372
<?endif?>
362373
<?if $(IncludeX64) = True?>
@@ -366,13 +377,15 @@
366377
</Component>
367378
<Component Directory="Testing_usr_bin64" DiskId="3">
368379
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_Foundation.dll" />
380+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_WinSDK.dll" />
369381
</Component>
370382

371383
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
372384
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\Testing.lib" />
373385
</Component>
374386
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
375387
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_Foundation.lib" />
388+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_WinSDK.lib" />
376389
</Component>
377390

378391
<Component Directory="Testing.swiftmodule" DiskId="3">
@@ -388,6 +401,13 @@
388401
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
389402
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
390403
</Component>
404+
405+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="3">
406+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
407+
</Component>
408+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="3">
409+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
410+
</Component>
391411
</ComponentGroup>
392412
<?endif?>
393413
<?if $(IncludeX86) = True?>
@@ -398,12 +418,14 @@
398418
<Component Directory="Testing_usr_bin32" DiskId="4">
399419
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_Foundation.dll" />
400420
</Component>
421+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_WinSDK.dll" />
401422

402423
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
403424
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\Testing.lib" />
404425
</Component>
405426
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
406427
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_Foundation.lib" />
428+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_WinSDK.lib" />
407429
</Component>
408430

409431
<Component Directory="Testing.swiftmodule" DiskId="4">
@@ -419,6 +441,13 @@
419441
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
420442
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
421443
</Component>
444+
445+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="4">
446+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
447+
</Component>
448+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="4">
449+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
450+
</Component>
422451
</ComponentGroup>
423452
<?endif?>
424453

0 commit comments

Comments
 (0)