Skip to content

Commit b182428

Browse files
compnerdcompnerd
committed
WiX: adjust the packaging rules for the Windows SDK
With the install rules for Swift now packaging up the auxiliary SDK files as they are used by the compiler directly, simplify the packaging rules and remove the dependency on the checked out copy of the Swift repository.
1 parent 927c674 commit b182428

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎platforms/Windows/sdk-amd64.wxs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -496,18 +496,18 @@
496496
-->
497497
</ComponentGroup>
498498

499-
<ComponentGroup Id="SupportFiles" Directory="WindowsSDK_usr_share">
499+
<ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
500500
<Component Id="ucrt.modulemap" Guid="4b5c1a1d-a6cf-4d06-81f7-e752f0a3f4db">
501-
<File Id="ucrt.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\ucrt.modulemap" Checksum="yes" />
501+
<File Id="ucrt.modulemap" Source="$(var.SDK_ROOT)\usr\share\ucrt.modulemap" Checksum="yes" />
502502
</Component>
503503
<Component Id="winsdk.modulemap" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
504-
<File Id="winsdk.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\winsdk.modulemap" Checksum="yes" />
505-
</Component>
506-
<Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
507-
<File Id="vcruntime.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\vcruntime.modulemap" Checksum="yes" />
504+
<File Id="winsdk.modulemap" Source="$(var.SDK_ROOT)\usr\share\winsdk.modulemap" Checksum="yes" />
508505
</Component>
509506
<Component Id="vcruntime.apinotes" Guid="11318e14-7d68-490e-8c64-f1332f1d63f7">
510-
<File Id="vcruntime.apinotes" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\vcruntime.apinotes" Checksum="yes" />
507+
<File Id="vcruntime.apinotes" Source="$(var.SDK_ROOT)\usr\share\vcruntime.apinotes" Checksum="yes" />
508+
</Component>
509+
<Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
510+
<File Id="vcruntime.modulemap" Source="$(var.SDK_ROOT)\usr\share\vcruntime.modulemap" Checksum="yes" />
511511
</Component>
512512
</ComponentGroup>
513513

@@ -553,7 +553,7 @@
553553
<ComponentGroupRef Id="CXXShims" />
554554

555555
<ComponentGroupRef Id="Registrar" />
556-
<ComponentGroupRef Id="SupportFiles" />
556+
<ComponentGroupRef Id="AuxiliaryFiles" />
557557
<ComponentGroupRef Id="Configuration" />
558558

559559
<ComponentRef Id="EnvironmentVariables" />

‎platforms/Windows/sdk-arm64.wxs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -496,18 +496,18 @@
496496
-->
497497
</ComponentGroup>
498498

499-
<ComponentGroup Id="SupportFiles" Directory="WindowsSDK_usr_share">
499+
<ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
500500
<Component Id="ucrt.modulemap" Guid="4b5c1a1d-a6cf-4d06-81f7-e752f0a3f4db">
501-
<File Id="ucrt.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\ucrt.modulemap" Checksum="yes" />
501+
<File Id="ucrt.modulemap" Source="$(var.SDK_ROOT)\usr\share\ucrt.modulemap" Checksum="yes" />
502502
</Component>
503503
<Component Id="winsdk.modulemap" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
504-
<File Id="winsdk.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\winsdk.modulemap" Checksum="yes" />
505-
</Component>
506-
<Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
507-
<File Id="vcruntime.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\vcruntime.modulemap" Checksum="yes" />
504+
<File Id="winsdk.modulemap" Source="$(var.SDK_ROOT)\usr\share\winsdk.modulemap" Checksum="yes" />
508505
</Component>
509506
<Component Id="vcruntime.apinotes" Guid="11318e14-7d68-490e-8c64-f1332f1d63f7">
510-
<File Id="vcruntime.apinotes" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\vcruntime.apinotes" Checksum="yes" />
507+
<File Id="vcruntime.apinotes" Source="$(var.SDK_ROOT)\usr\share\vcruntime.apinotes" Checksum="yes" />
508+
</Component>
509+
<Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
510+
<File Id="vcruntime.modulemap" Source="$(var.SDK_ROOT)\usr\share\vcruntime.modulemap" Checksum="yes" />
511511
</Component>
512512
</ComponentGroup>
513513

@@ -553,7 +553,7 @@
553553
<ComponentGroupRef Id="CXXShims" />
554554

555555
<ComponentGroupRef Id="Registrar" />
556-
<ComponentGroupRef Id="SupportFiles" />
556+
<ComponentGroupRef Id="AuxiliaryFiles" />
557557
<ComponentGroupRef Id="Configuration" />
558558

559559
<ComponentRef Id="EnvironmentVariables" />

‎platforms/Windows/sdk-x86.wxs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -496,18 +496,18 @@
496496
-->
497497
</ComponentGroup>
498498

499-
<ComponentGroup Id="SupportFiles" Directory="WindowsSDK_usr_share">
499+
<ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
500500
<Component Id="ucrt.modulemap" Guid="4b5c1a1d-a6cf-4d06-81f7-e752f0a3f4db">
501-
<File Id="ucrt.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\ucrt.modulemap" Checksum="yes" />
501+
<File Id="ucrt.modulemap" Source="$(var.SDK_ROOT)\usr\share\ucrt.modulemap" Checksum="yes" />
502502
</Component>
503503
<Component Id="winsdk.modulemap" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
504-
<File Id="winsdk.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\winsdk.modulemap" Checksum="yes" />
505-
</Component>
506-
<Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
507-
<File Id="vcruntime.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\vcruntime.modulemap" Checksum="yes" />
504+
<File Id="winsdk.modulemap" Source="$(var.SDK_ROOT)\usr\share\winsdk.modulemap" Checksum="yes" />
508505
</Component>
509506
<Component Id="vcruntime.apinotes" Guid="11318e14-7d68-490e-8c64-f1332f1d63f7">
510-
<File Id="vcruntime.apinotes" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\vcruntime.apinotes" Checksum="yes" />
507+
<File Id="vcruntime.apinotes" Source="$(var.SDK_ROOT)\usr\share\vcruntime.apinotes" Checksum="yes" />
508+
</Component>
509+
<Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
510+
<File Id="vcruntime.modulemap" Source="$(var.SDK_ROOT)\usr\share\vcruntime.modulemap" Checksum="yes" />
511511
</Component>
512512
</ComponentGroup>
513513

@@ -547,7 +547,7 @@
547547
<ComponentGroupRef Id="CXXShims" />
548548

549549
<ComponentGroupRef Id="Registrar" />
550-
<ComponentGroupRef Id="SupportFiles" />
550+
<ComponentGroupRef Id="AuxiliaryFiles" />
551551
<ComponentGroupRef Id="Configuration" />
552552

553553
<?ifdef INCLUDE_DEBUG_INFO ?>

‎platforms/Windows/sdk.wixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Import Project="WiXCodeSigning.targets" />
3131

3232
<PropertyGroup>
33-
<DefineConstants>ProductVersion=$(ProductVersion);PLATFORM_ROOT=$(PLATFORM_ROOT);SDK_ROOT=$(SDK_ROOT);SWIFT_SOURCE_DIR=$(SWIFT_SOURCE_DIR);SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims;</DefineConstants>
33+
<DefineConstants>ProductVersion=$(ProductVersion);PLATFORM_ROOT=$(PLATFORM_ROOT);SDK_ROOT=$(SDK_ROOT);SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims;</DefineConstants>
3434
<HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
3535
<HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
3636
<HarvestDirectoryNoLogo>true</HarvestDirectoryNoLogo>

0 commit comments

Comments
 (0)