Skip to content

Commit 95a7182

Browse files
committed
WiX: package up the new SwiftRemoteMirror builds
This adds the SiftRemoteMirror to the packaging on Windows to round out the new SDK. With this piece, it might be possible to host the entire Swift toolchain with a SxS enabled runtime.
1 parent d7ee18f commit 95a7182

File tree

1 file changed

+47
-0
lines changed

1 file changed

+47
-0
lines changed

platforms/Windows/platforms/windows/windows.wxs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@
181181
<Directory Id="WindowsExperimentalSDK_usr_include_os" Name="os" DiskId="5" />
182182
<Directory Id="WindowsExperimentalSDK_usr_include__foundation_unicode" Name="_foundation_unicode" DiskId="5" />
183183
<Directory Id="WindowsExperimentalSDK_usr_include__FoundationCShims" Name="_Foundation_CShims" DiskId="5" />
184+
<Directory Name="swift">
185+
<Directory Id="WindowsExperimentalSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" DiskId="5" />
186+
</Directory>
184187
</Directory>
185188
<Directory Name="lib">
186189
<Directory Name="swift">
@@ -434,6 +437,46 @@
434437
</ComponentGroup>
435438
<?endif?>
436439

440+
<ComponentGroup Id="ExperimentalSwiftRemoteMirror" Directory="WindowsExperimentalSDK_usr_include_swift_SwiftRemoteMirror">
441+
<Component>
442+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
443+
</Component>
444+
<Component>
445+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
446+
</Component>
447+
<Component>
448+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
449+
</Component>
450+
<Component>
451+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
452+
</Component>
453+
<Component>
454+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
455+
</Component>
456+
</ComponentGroup>
457+
458+
<?if $(IncludeARM64) = True?>
459+
<ComponentGroup Id="libSwiftRemoteMirror.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
460+
<Component DiskId="6">
461+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\swiftRemoteMirror.lib" />
462+
</Component>
463+
</ComponentGroup>
464+
<?endif?>
465+
<?if $(IncludeX64) = True?>
466+
<ComponentGroup Id="libSwiftRemoteMirror.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
467+
<Component DiskId="7">
468+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\swiftRemoteMirror.lib" />
469+
</Component>
470+
</ComponentGroup>
471+
<?endif?>
472+
<?if $(IncludeX86) = True?>
473+
<ComponentGroup Id="libSwiftRemoteMirror.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
474+
<Component DiskId="8">
475+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\swiftRemoteMirror.lib" />
476+
</Component>
477+
</ComponentGroup>
478+
<?endif?>
479+
437480
<!-- BlocksRuntime -->
438481
<ComponentGroup Id="LegacyBlocksRuntime">
439482
<Component Directory="WindowsSDK_usr_include_Block">
@@ -3061,6 +3104,7 @@
30613104

30623105
<ComponentGroupRef Id="ExperimentalAuxiliaryFiles" />
30633106
<ComponentGroupRef Id="ExperimentalConfiguration" />
3107+
<ComponentGroupRef Id="ExperimentalSwiftRemoteMirror" />
30643108
<ComponentGroupRef Id="ExperimentalSwiftShims" />
30653109

30663110
<!-- MSI management Components -->
@@ -3095,6 +3139,7 @@
30953139
<ComponentGroupRef Id="libSwift.arm64" />
30963140
<ComponentGroupRef Id="libswiftDispatch.arm64" />
30973141
<ComponentGroupRef Id="libSwiftOnoneSupport.arm64" />
3142+
<ComponentGroupRef Id="libSwiftRemoteMirror.arm64" />
30983143
<ComponentGroupRef Id="libSynchronization.arm64" />
30993144
<ComponentGroupRef Id="libWinSDK.arm64" />
31003145

@@ -3130,6 +3175,7 @@
31303175
<ComponentGroupRef Id="libSwift.x64" />
31313176
<ComponentGroupRef Id="libswiftDispatch.x64" />
31323177
<ComponentGroupRef Id="libSwiftOnoneSupport.x64" />
3178+
<ComponentGroupRef Id="libSwiftRemoteMirror.x64" />
31333179
<ComponentGroupRef Id="libSynchronization.x64" />
31343180
<ComponentGroupRef Id="libWinSDK.x64" />
31353181

@@ -3165,6 +3211,7 @@
31653211
<ComponentGroupRef Id="libSwift.x86" />
31663212
<ComponentGroupRef Id="libswiftDispatch.x86" />
31673213
<ComponentGroupRef Id="libSwiftOnoneSupport.x86" />
3214+
<ComponentGroupRef Id="libSwiftRemoteMirror.x86" />
31683215
<ComponentGroupRef Id="libSynchronization.x86" />
31693216
<ComponentGroupRef Id="libWinSDK.x86" />
31703217

0 commit comments

Comments
 (0)