Skip to content

WiX: a collection of small clean up to the packaging rules #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 22, 2025
+52 −53
Merged

WiX: a collection of small clean up to the packaging rules #454

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
018c686
WiX: clean up disk tracking for C++ interop
compnerd Jul 26, 2025
57ab38a
WiX: clean up the sort order for the static experimental SDK
compnerd Aug 15, 2025
5aba162
WiX: clean up the blocks runtime header packaging
compnerd Aug 15, 2025
7f412e7
WiX: clean up the libdispatch runtime header packaging
compnerd Aug 15, 2025
df9a756
WiX: clean up the SwiftRuntimeMirror header packaging
compnerd Aug 15, 2025
b6fd927
WiX: clean up component naming for Foundation shims
compnerd Jul 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 52 additions & 53 deletions platforms/Windows/platforms/windows/windows.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
</Directory>
<Directory Name="lib">
<Directory Name="swift">
<Directory Id="WindowsExperimentalSDK_usr_lib_swift_apinotes" Name="apinotes" />
<Directory Id="WindowsExperimentalSDK_usr_lib_swift_apinotes" Name="apinotes" DiskId="5" />
<Directory Id="WindowsExperimentalSDK_usr_lib_swift_shims" Name="shims" />
<Directory Id="WindowsExperimentalSDK_usr_lib_swift_windows" Name="windows">
<?if $(IncludeARM64) = True?>
Expand All @@ -203,13 +203,6 @@
</Directory>
<Directory Name="swift_static">
<Directory Name="windows">
<Directory Id="lib_Builtin_float.swiftmodule" Name="Builtin_float.swiftmodule" />
<Directory Id="lib_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
<Directory Id="lib_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
<Directory Id="lib_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
<Directory Id="lib_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
<Directory Id="lib_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
<Directory Id="lib_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
<Directory Id="libCRT.swiftmodule" Name="CRT.swiftmodule" />
<Directory Id="libCxx.swiftmodule" Name="Cxx.swiftmodule" />
<Directory Id="libCxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
Expand All @@ -226,6 +219,13 @@
<Directory Id="libSwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
<Directory Id="libSynchronization.swiftmodule" Name="Synchronization.swiftmodule" />
<Directory Id="libWinSDK.swiftmodule" Name="WinSDK.swiftmodule" />
<Directory Id="lib_Builtin_float.swiftmodule" Name="Builtin_float.swiftmodule" />
<Directory Id="lib_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
<Directory Id="lib_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
<Directory Id="lib_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
<Directory Id="lib_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
<Directory Id="lib_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
<Directory Id="lib_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
<?if $(IncludeARM64) = True?>
<Directory Id="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" Name="aarch64" DiskId="6" />
<?endif?>
Expand Down Expand Up @@ -400,7 +400,7 @@
<?endif?>

<!-- SwiftRemoteMirror -->
<ComponentGroup Id="SwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
<ComponentGroup Id="LegacySwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
<Component>
<File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
</Component>
Expand Down Expand Up @@ -509,7 +509,7 @@
</ComponentGroup>
<?endif?>

<ComponentGroup Id="libBlocksRuntime" Directory="WindowsExperimentalSDK_usr_include_Block">
<ComponentGroup Id="ExperimentalBlocksRuntime" Directory="WindowsExperimentalSDK_usr_include_Block">
<Component>
<File Source="$(ExperimentalSDKRoot)\usr\include\Block\Block.h" />
</Component>
Expand Down Expand Up @@ -609,7 +609,7 @@
</ComponentGroup>
<?endif?>

<ComponentGroup Id="libdispatch" Directory="WindowsExperimentalSDK_usr_include_dispatch">
<ComponentGroup Id="ExperimentalDispatch" Directory="WindowsExperimentalSDK_usr_include_dispatch">
<?define Disk = 5?>
<?include ../CDispatch.wxi?>
<?undef Disk?>
Expand Down Expand Up @@ -722,7 +722,7 @@
</ComponentGroup>
<?endif?>

<ComponentGroup Id="lib_FoundationUnicode" Directory="WindowsExperimentalSDK_usr_include__foundation_unicode">
<ComponentGroup Id="Experimental_FoundationUnicode" Directory="WindowsExperimentalSDK_usr_include__foundation_unicode">
<?define Disk = 5?>
<?include ../_FoundationUnicode.wxi?>
<?undef Disk?>
Expand Down Expand Up @@ -757,7 +757,7 @@
<?undef Disk?>
</ComponentGroup>

<ComponentGroup Id="lib_FoundationCShims" Directory="WindowsExperimentalSDK_usr_include__FoundationCShims">
<ComponentGroup Id="Experimental_FoundationCShims" Directory="WindowsExperimentalSDK_usr_include__FoundationCShims">
<?define Disk = 5?>
<?include ../_FoundationCShims.wxi?>
<?undef Disk?>
Expand Down Expand Up @@ -2825,7 +2825,7 @@
</ComponentGroup>

<ComponentGroup Id="ExperimentalAPINotes" Directory="WindowsExperimentalSDK_usr_lib_swift_apinotes">
<Component DiskId="5">
<Component>
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
</Component>
</ComponentGroup>
Expand Down Expand Up @@ -3052,7 +3052,7 @@

<!-- Features -->
<Feature Id="SDK" AllowAbsent="no" Title="!(loc.Plt_ProductName_Windows)">
<ComponentGroupRef Id="SwiftRemoteMirror" />
<ComponentGroupRef Id="LegacySwiftRemoteMirror" />
<ComponentGroupRef Id="LegacyBlocksRuntime" />
<ComponentGroupRef Id="Legacydispatch" />
<ComponentGroupRef Id="Legacy_FoundationUnicode" />
Expand Down Expand Up @@ -3204,17 +3204,16 @@
<?endif?>

<Feature Id="ExperimentalSDK" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental)">
<ComponentGroupRef Id="lib_FoundationUnicode" />
<ComponentGroupRef Id="lib_FoundationCShims" />
<ComponentGroupRef Id="libBlocksRuntime" />
<ComponentGroupRef Id="libdispatch" />

<ComponentGroupRef Id="ExperimentalAPINotes" />
<ComponentGroupRef Id="ExperimentalAuxiliaryFiles" />
<ComponentGroupRef Id="ExperimentalBlocksRuntime" />
<ComponentGroupRef Id="ExperimentalCXXShim" />
<ComponentGroupRef Id="ExperimentalConfiguration" />
<ComponentGroupRef Id="ExperimentalDispatch" />
<ComponentGroupRef Id="ExperimentalSwiftRemoteMirror" />
<ComponentGroupRef Id="ExperimentalSwiftShims" />
<ComponentGroupRef Id="Experimental_FoundationCShims" />
<ComponentGroupRef Id="Experimental_FoundationUnicode" />

<!-- MSI management Components -->
<ComponentGroupRef Id="VersionedDirectoryCleanup" />
Expand All @@ -3225,21 +3224,11 @@
<Level Condition="InstallARM64ExperimentalSDK = 1" Value="1" />

<ComponentGroupRef Id="CoreFoundation.arm64" />
<ComponentGroupRef Id="lib_Builtin_float.arm64" />
<ComponentGroupRef Id="lib_Concurrency.arm64" />
<ComponentGroupRef Id="lib_Differentiation.arm64" />
<ComponentGroupRef Id="lib_FoundationCollections.arm64" />
<ComponentGroupRef Id="lib_FoundationCShims.arm64" />
<ComponentGroupRef Id="lib_FoundationUnicode.arm64" />
<ComponentGroupRef Id="lib_RegexParser.arm64" />
<ComponentGroupRef Id="lib_StringProcessing.arm64" />
<ComponentGroupRef Id="lib_Volatile.arm64" />
<ComponentGroupRef Id="libBlocksRuntime.arm64" />
<ComponentGroupRef Id="libCRT.arm64" />
<ComponentGroupRef Id="libCxx.arm64" />
<ComponentGroupRef Id="libCxxStdlib.arm64" />
<ComponentGroupRef Id="libDistributed.arm64" />
<ComponentGroupRef Id="libdispatch.arm64" />
<ComponentGroupRef Id="libFoundation.arm64" />
<ComponentGroupRef Id="libFoundationEssentials.arm64" />
<ComponentGroupRef Id="libFoundationInternationalization.arm64" />
Expand All @@ -3248,11 +3237,21 @@
<ComponentGroupRef Id="libObservation.arm64" />
<ComponentGroupRef Id="libRegexBuilder.arm64" />
<ComponentGroupRef Id="libSwift.arm64" />
<ComponentGroupRef Id="libswiftDispatch.arm64" />
<ComponentGroupRef Id="libSwiftOnoneSupport.arm64" />
<ComponentGroupRef Id="libSwiftRemoteMirror.arm64" />
<ComponentGroupRef Id="libSynchronization.arm64" />
<ComponentGroupRef Id="libWinSDK.arm64" />
<ComponentGroupRef Id="lib_Builtin_float.arm64" />
<ComponentGroupRef Id="lib_Concurrency.arm64" />
<ComponentGroupRef Id="lib_Differentiation.arm64" />
<ComponentGroupRef Id="lib_FoundationCShims.arm64" />
<ComponentGroupRef Id="lib_FoundationCollections.arm64" />
<ComponentGroupRef Id="lib_FoundationUnicode.arm64" />
<ComponentGroupRef Id="lib_RegexParser.arm64" />
<ComponentGroupRef Id="lib_StringProcessing.arm64" />
<ComponentGroupRef Id="lib_Volatile.arm64" />
<ComponentGroupRef Id="libdispatch.arm64" />
<ComponentGroupRef Id="libswiftDispatch.arm64" />

<ComponentGroupRef Id="ExperimentalRegistrar.arm64" />
</Feature>
Expand All @@ -3263,21 +3262,11 @@
<Level Condition="InstallX64ExperimentalSDK = 1" Value="1" />

<ComponentGroupRef Id="CoreFoundation.x64" />
<ComponentGroupRef Id="lib_Builtin_float.x64" />
<ComponentGroupRef Id="lib_Concurrency.x64" />
<ComponentGroupRef Id="lib_Differentiation.x64" />
<ComponentGroupRef Id="lib_FoundationCollections.x64" />
<ComponentGroupRef Id="lib_FoundationCShims.x64" />
<ComponentGroupRef Id="lib_FoundationUnicode.x64" />
<ComponentGroupRef Id="lib_RegexParser.x64" />
<ComponentGroupRef Id="lib_StringProcessing.x64" />
<ComponentGroupRef Id="lib_Volatile.x64" />
<ComponentGroupRef Id="libBlocksRuntime.x64" />
<ComponentGroupRef Id="libCRT.x64" />
<ComponentGroupRef Id="libCxx.x64" />
<ComponentGroupRef Id="libCxxStdlib.x64" />
<ComponentGroupRef Id="libDistributed.x64" />
<ComponentGroupRef Id="libdispatch.x64" />
<ComponentGroupRef Id="libFoundation.x64" />
<ComponentGroupRef Id="libFoundationEssentials.x64" />
<ComponentGroupRef Id="libFoundationInternationalization.x64" />
Expand All @@ -3286,11 +3275,21 @@
<ComponentGroupRef Id="libObservation.x64" />
<ComponentGroupRef Id="libRegexBuilder.x64" />
<ComponentGroupRef Id="libSwift.x64" />
<ComponentGroupRef Id="libswiftDispatch.x64" />
<ComponentGroupRef Id="libSwiftOnoneSupport.x64" />
<ComponentGroupRef Id="libSwiftRemoteMirror.x64" />
<ComponentGroupRef Id="libSynchronization.x64" />
<ComponentGroupRef Id="libWinSDK.x64" />
<ComponentGroupRef Id="lib_Builtin_float.x64" />
<ComponentGroupRef Id="lib_Concurrency.x64" />
<ComponentGroupRef Id="lib_Differentiation.x64" />
<ComponentGroupRef Id="lib_FoundationCShims.x64" />
<ComponentGroupRef Id="lib_FoundationCollections.x64" />
<ComponentGroupRef Id="lib_FoundationUnicode.x64" />
<ComponentGroupRef Id="lib_RegexParser.x64" />
<ComponentGroupRef Id="lib_StringProcessing.x64" />
<ComponentGroupRef Id="lib_Volatile.x64" />
<ComponentGroupRef Id="libdispatch.x64" />
<ComponentGroupRef Id="libswiftDispatch.x64" />

<ComponentGroupRef Id="ExperimentalRegistrar.x64" />
</Feature>
Expand All @@ -3301,21 +3300,11 @@
<Level Condition="InstallX86ExperimentalSDK = 1" Value="1" />

<ComponentGroupRef Id="CoreFoundation.x86" />
<ComponentGroupRef Id="lib_Builtin_float.x86" />
<ComponentGroupRef Id="lib_Concurrency.x86" />
<ComponentGroupRef Id="lib_Differentiation.x86" />
<ComponentGroupRef Id="lib_FoundationCollections.x86" />
<ComponentGroupRef Id="lib_FoundationCShims.x86" />
<ComponentGroupRef Id="lib_FoundationUnicode.x86" />
<ComponentGroupRef Id="lib_RegexParser.x86" />
<ComponentGroupRef Id="lib_StringProcessing.x86" />
<ComponentGroupRef Id="lib_Volatile.x86" />
<ComponentGroupRef Id="libBlocksRuntime.x86" />
<ComponentGroupRef Id="libCRT.x86" />
<ComponentGroupRef Id="libCxx.x86" />
<ComponentGroupRef Id="libCxxStdlib.x86" />
<ComponentGroupRef Id="libDistributed.x86" />
<ComponentGroupRef Id="libdispatch.x86" />
<ComponentGroupRef Id="libFoundation.x86" />
<ComponentGroupRef Id="libFoundationEssentials.x86" />
<ComponentGroupRef Id="libFoundationInternationalization.x86" />
Expand All @@ -3324,11 +3313,21 @@
<ComponentGroupRef Id="libObservation.x86" />
<ComponentGroupRef Id="libRegexBuilder.x86" />
<ComponentGroupRef Id="libSwift.x86" />
<ComponentGroupRef Id="libswiftDispatch.x86" />
<ComponentGroupRef Id="libSwiftOnoneSupport.x86" />
<ComponentGroupRef Id="libSwiftRemoteMirror.x86" />
<ComponentGroupRef Id="libSynchronization.x86" />
<ComponentGroupRef Id="libWinSDK.x86" />
<ComponentGroupRef Id="lib_Builtin_float.x86" />
<ComponentGroupRef Id="lib_Concurrency.x86" />
<ComponentGroupRef Id="lib_Differentiation.x86" />
<ComponentGroupRef Id="lib_FoundationCShims.x86" />
<ComponentGroupRef Id="lib_FoundationCollections.x86" />
<ComponentGroupRef Id="lib_FoundationUnicode.x86" />
<ComponentGroupRef Id="lib_RegexParser.x86" />
<ComponentGroupRef Id="lib_StringProcessing.x86" />
<ComponentGroupRef Id="lib_Volatile.x86" />
<ComponentGroupRef Id="libdispatch.x86" />
<ComponentGroupRef Id="libswiftDispatch.x86" />

<ComponentGroupRef Id="ExperimentalRegistrar.x86" />
</Feature>
Expand Down