Skip to content

Commit 9b076cc

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 c686f2b commit 9b076cc

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">
@@ -437,6 +440,46 @@
437440
</ComponentGroup>
438441
<?endif?>
439442

443+
<ComponentGroup Id="ExperimentalSwiftRemoteMirror" Directory="WindowsExperimentalSDK_usr_include_swift_SwiftRemoteMirror">
444+
<Component>
445+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
446+
</Component>
447+
<Component>
448+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
449+
</Component>
450+
<Component>
451+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
452+
</Component>
453+
<Component>
454+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
455+
</Component>
456+
<Component>
457+
<File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
458+
</Component>
459+
</ComponentGroup>
460+
461+
<?if $(IncludeARM64) = True?>
462+
<ComponentGroup Id="libSwiftRemoteMirror.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
463+
<Component DiskId="6">
464+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\swiftRemoteMirror.lib" />
465+
</Component>
466+
</ComponentGroup>
467+
<?endif?>
468+
<?if $(IncludeX64) = True?>
469+
<ComponentGroup Id="libSwiftRemoteMirror.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
470+
<Component DiskId="7">
471+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\swiftRemoteMirror.lib" />
472+
</Component>
473+
</ComponentGroup>
474+
<?endif?>
475+
<?if $(IncludeX86) = True?>
476+
<ComponentGroup Id="libSwiftRemoteMirror.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
477+
<Component DiskId="8">
478+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\swiftRemoteMirror.lib" />
479+
</Component>
480+
</ComponentGroup>
481+
<?endif?>
482+
440483
<!-- BlocksRuntime -->
441484
<ComponentGroup Id="LegacyBlocksRuntime">
442485
<Component Directory="WindowsSDK_usr_include_Block">
@@ -3170,6 +3213,7 @@
31703213
<ComponentGroupRef Id="ExperimentalAuxiliaryFiles" />
31713214
<ComponentGroupRef Id="ExperimentalCXXShim" />
31723215
<ComponentGroupRef Id="ExperimentalConfiguration" />
3216+
<ComponentGroupRef Id="ExperimentalSwiftRemoteMirror" />
31733217
<ComponentGroupRef Id="ExperimentalSwiftShims" />
31743218

31753219
<!-- MSI management Components -->
@@ -3206,6 +3250,7 @@
32063250
<ComponentGroupRef Id="libSwift.arm64" />
32073251
<ComponentGroupRef Id="libswiftDispatch.arm64" />
32083252
<ComponentGroupRef Id="libSwiftOnoneSupport.arm64" />
3253+
<ComponentGroupRef Id="libSwiftRemoteMirror.arm64" />
32093254
<ComponentGroupRef Id="libSynchronization.arm64" />
32103255
<ComponentGroupRef Id="libWinSDK.arm64" />
32113256

@@ -3243,6 +3288,7 @@
32433288
<ComponentGroupRef Id="libSwift.x64" />
32443289
<ComponentGroupRef Id="libswiftDispatch.x64" />
32453290
<ComponentGroupRef Id="libSwiftOnoneSupport.x64" />
3291+
<ComponentGroupRef Id="libSwiftRemoteMirror.x64" />
32463292
<ComponentGroupRef Id="libSynchronization.x64" />
32473293
<ComponentGroupRef Id="libWinSDK.x64" />
32483294

@@ -3280,6 +3326,7 @@
32803326
<ComponentGroupRef Id="libSwift.x86" />
32813327
<ComponentGroupRef Id="libswiftDispatch.x86" />
32823328
<ComponentGroupRef Id="libSwiftOnoneSupport.x86" />
3329+
<ComponentGroupRef Id="libSwiftRemoteMirror.x86" />
32833330
<ComponentGroupRef Id="libSynchronization.x86" />
32843331
<ComponentGroupRef Id="libWinSDK.x86" />
32853332

0 commit comments

Comments
 (0)