Skip to content

Commit 319625c

Browse files
committed
WiX: package up BlocksRuntime for the dynamic experimental SDK
When distributing the dynamic SDK, we need to also provide BlocksRuntime which is a dependency for the runtime. This adds the missing library for the dynamic component (it was already present in the legacy and the static versions).
1 parent b7541f2 commit 319625c

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

platforms/Windows/platforms/windows/windows.wxs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,27 @@
553553
</Component>
554554
</ComponentGroup>
555555

556+
<?if $(IncludeARM64) = True?>
557+
<ComponentGroup Id="BlocksRuntime.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
558+
<Component DiskId="6">
559+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\BlocksRuntime.lib" />
560+
</Component>
561+
</ComponentGroup>
562+
<?endif?>
563+
<?if $(IncludeX64) = True?>
564+
<ComponentGroup Id="BlocksRuntime.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
565+
<Component DiskId="7">
566+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\BlocksRuntime.lib" />
567+
</Component>
568+
</ComponentGroup>
569+
<?endif?>
570+
<?if $(IncludeX86) = True?>
571+
<ComponentGroup Id="BlocksRuntime.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
572+
<Component DiskId="8">
573+
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\BlocksRuntime.lib" />
574+
</Component>
575+
</ComponentGroup>
576+
<?endif?>
556577
<?if $(IncludeARM64) = True?>
557578
<ComponentGroup Id="libBlocksRuntime.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
558579
<Component DiskId="6">
@@ -4124,6 +4145,7 @@
41244145
<Feature Id="ExperimentalARM64" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental_arm64)">
41254146
<Level Condition="InstallARM64ExperimentalSDK = 1" Value="1" />
41264147

4148+
<ComponentGroupRef Id="BlocksRuntime.arm64" />
41274149
<ComponentGroupRef Id="CRT.arm64" />
41284150
<ComponentGroupRef Id="Cxx.arm64" />
41294151
<ComponentGroupRef Id="CxxStdlib.arm64" />
@@ -4193,6 +4215,7 @@
41934215
<Feature Id="ExperimentalX64" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental_amd64)">
41944216
<Level Condition="InstallX64ExperimentalSDK = 1" Value="1" />
41954217

4218+
<ComponentGroupRef Id="BlocksRuntime.x64" />
41964219
<ComponentGroupRef Id="CRT.x64" />
41974220
<ComponentGroupRef Id="Cxx.x64" />
41984221
<ComponentGroupRef Id="CxxStdlib.x64" />
@@ -4262,6 +4285,7 @@
42624285
<Feature Id="ExperimentalX86" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental_x86)">
42634286
<Level Condition="InstallX86ExperimentalSDK = 1" Value="1" />
42644287

4288+
<ComponentGroupRef Id="BlocksRuntime.x86" />
42654289
<ComponentGroupRef Id="CRT.x86" />
42664290
<ComponentGroupRef Id="Cxx.x86" />
42674291
<ComponentGroupRef Id="CxxStdlib.x86" />

0 commit comments

Comments
 (0)