Skip to content

Commit 73d91f7

Browse files
grynspangrynspan
authored
WiX: Add the Testing/WinSDK cross-import overlay (#460)
* WiX: Add the Testing/WinSDK cross-import overlay Adds the files generated by swiftlang/swift-testing#1296. See also #403 for reference.
1 parent e1342a8 commit 73d91f7

File tree

1 file changed

+43
-0
lines changed

1 file changed

+43
-0
lines changed

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

Lines changed: 43 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?>
@@ -327,6 +328,9 @@
327328
<Component Directory="Testing.swiftcrossimport">
328329
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
329330
</Component>
331+
<Component Directory="Testing.swiftcrossimport">
332+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\WinSDK.swiftoverlay" />
333+
</Component>
330334
</ComponentGroup>
331335
<?if $(IncludeARM64) = True?>
332336
<ComponentGroup Id="Testing.arm64">
@@ -336,13 +340,19 @@
336340
<Component Directory="Testing_usr_bin64a" DiskId="2">
337341
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_Foundation.dll" />
338342
</Component>
343+
<Component Directory="Testing_usr_bin64a" DiskId="2">
344+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_WinSDK.dll" />
345+
</Component>
339346

340347
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
341348
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\Testing.lib" />
342349
</Component>
343350
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
344351
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_Foundation.lib" />
345352
</Component>
353+
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
354+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_WinSDK.lib" />
355+
</Component>
346356

347357
<Component Directory="Testing.swiftmodule" DiskId="2">
348358
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
@@ -357,6 +367,13 @@
357367
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
358368
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
359369
</Component>
370+
371+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="2">
372+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
373+
</Component>
374+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="2">
375+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
376+
</Component>
360377
</ComponentGroup>
361378
<?endif?>
362379
<?if $(IncludeX64) = True?>
@@ -367,13 +384,19 @@
367384
<Component Directory="Testing_usr_bin64" DiskId="3">
368385
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_Foundation.dll" />
369386
</Component>
387+
<Component Directory="Testing_usr_bin64" DiskId="3">
388+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_WinSDK.dll" />
389+
</Component>
370390

371391
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
372392
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\Testing.lib" />
373393
</Component>
374394
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
375395
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_Foundation.lib" />
376396
</Component>
397+
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
398+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_WinSDK.lib" />
399+
</Component>
377400

378401
<Component Directory="Testing.swiftmodule" DiskId="3">
379402
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
@@ -388,6 +411,13 @@
388411
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
389412
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
390413
</Component>
414+
415+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="3">
416+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
417+
</Component>
418+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="3">
419+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
420+
</Component>
391421
</ComponentGroup>
392422
<?endif?>
393423
<?if $(IncludeX86) = True?>
@@ -398,13 +428,19 @@
398428
<Component Directory="Testing_usr_bin32" DiskId="4">
399429
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_Foundation.dll" />
400430
</Component>
431+
<Component Directory="Testing_usr_bin32" DiskId="4">
432+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_WinSDK.dll" />
433+
</Component>
401434

402435
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
403436
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\Testing.lib" />
404437
</Component>
405438
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
406439
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_Foundation.lib" />
407440
</Component>
441+
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
442+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_WinSDK.lib" />
443+
</Component>
408444

409445
<Component Directory="Testing.swiftmodule" DiskId="4">
410446
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
@@ -419,6 +455,13 @@
419455
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
420456
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
421457
</Component>
458+
459+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="4">
460+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
461+
</Component>
462+
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="4">
463+
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
464+
</Component>
422465
</ComponentGroup>
423466
<?endif?>
424467

0 commit comments

Comments
 (0)