Skip to content

WiX: package up the Testing cross-module overlay #403

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 1 commit into from
Apr 19, 2025
Merged

WiX: package up the Testing cross-module overlay #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 50 additions & 1 deletion platforms/Windows/platforms/android/android.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<Directory Name="lib">
<Directory Name="swift">
<Directory Name="android">
<Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
<?if $(IncludeARM64) = True?>
<Directory Id="Testing_usr_lib_swift_android_arm64" Name="aarch64" DiskId="2" />
<?endif?>
Expand All @@ -90,6 +91,7 @@
<?if $(IncludeX86) = True?>
<Directory Id="Testing_usr_lib_swift_android_x86" Name="i686" DiskId="5" />
<?endif?>
<Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
<Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
</Directory>
</Directory>
Expand Down Expand Up @@ -230,6 +232,11 @@
<?endif?>

<!-- Testing -->
<ComponentGroup Id="Testing">
<Component Directory="Testing.swiftcrossimport">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftcrossimport\Foundation.swiftoverlay" />
</Component>
</ComponentGroup>
<?if $(IncludeARM64) = True?>
<ComponentGroup Id="Testing.arm64">
<Component Directory="Testing.swiftmodule" DiskId="2">
Expand All @@ -239,9 +246,19 @@
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
</Component>

<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
</Component>
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
</Component>

<Component Directory="Testing_usr_lib_swift_android_arm64" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\libTesting.so" />
</Component>
<Component Directory="Testing_usr_lib_swift_android_arm64" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\lib_Testing_Foundation.so" />
</Component>
</ComponentGroup>
<?endif?>
<?if $(IncludeARM) = True?>
Expand All @@ -253,9 +270,19 @@
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
</Component>

<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
</Component>
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
</Component>

<Component Directory="Testing_usr_lib_swift_android_arm" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\libTesting.so" />
</Component>
<Component Directory="Testing_usr_lib_swift_android_arm" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\lib_Testing_Foundation.so" />
</Component>
</ComponentGroup>
<?endif?>
<?if $(IncludeX64) = True?>
Expand All @@ -267,9 +294,19 @@
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
</Component>

<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
</Component>
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
</Component>

<Component Directory="Testing_usr_lib_swift_android_x64" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\libTesting.so" />
</Component>
<Component Directory="Testing_usr_lib_swift_android_x64" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\lib_Testing_Foundation.so" />
</Component>
</ComponentGroup>
<?endif?>
<?if $(IncludeX86) = True?>
Expand All @@ -281,9 +318,19 @@
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\i686-unknown-linux-android.swiftinterface" />
</Component>

<Component Directory="Testing.swiftmodule" DiskId="5">
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="5">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
</Component>
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="5">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\i686-unknown-linux-android.swiftinterface" />
</Component>

<Component Directory="Testing_usr_lib_swift_android_x86" DiskId="5">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\libTesting.so" />
</Component>
<Component Directory="Testing_usr_lib_swift_android_x86" DiskId="5">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\lib_Testing_Foundation.so" />
</Component>
</ComponentGroup>
<?endif?>

Expand Down Expand Up @@ -2092,6 +2139,8 @@
<ComponentGroupRef Id="_FoundationUnicode" />
<ComponentGroupRef Id="_FoundationCShims" />

<ComponentGroupRef Id="Testing" />

<ComponentGroupRef Id="Configuration" />
<ComponentGroupRef Id="SwiftShims" />
<ComponentGroupRef Id="apinotes" />
Expand Down
54 changes: 54 additions & 0 deletions platforms/Windows/platforms/windows/windows.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<Directory Name="lib">
<Directory Name="swift">
<Directory Name="windows">
<Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
<?if $(IncludeARM64) = True?>
<Directory DiskId="2" Id="Testing_usr_lib_swift_windows_arm64" Name="aarch64" />
<?endif?>
Expand All @@ -98,6 +99,7 @@
<?if $(IncludeX86) = True?>
<Directory DiskId="4" Id="Testing_usr_lib_swift_windows_x86" Name="i686" />
<?endif?>
<Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
<Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
</Directory>
</Directory>
Expand Down Expand Up @@ -222,52 +224,102 @@
<?endif?>

<!-- Testing -->
<ComponentGroup Id="Testing">
<Component Directory="Testing.swiftcrossimport">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
</Component>
</ComponentGroup>
<?if $(IncludeARM64) = True?>
<ComponentGroup Id="Testing.arm64">
<Component Directory="Testing_usr_bin64a" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\Testing.dll" />
</Component>
<Component Directory="Testing_usr_bin64a" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_Foundation.dll" />
</Component>

<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\Testing.lib" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_Foundation.lib" />
</Component>

<Component Directory="Testing.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
</Component>
<Component Directory="Testing.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
</Component>

<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
</Component>
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
</Component>
</ComponentGroup>
<?endif?>
<?if $(IncludeX64) = True?>
<ComponentGroup Id="Testing.x64">
<Component Directory="Testing_usr_bin64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\Testing.dll" />
</Component>
<Component Directory="Testing_usr_bin64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_Foundation.dll" />
</Component>

<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\Testing.lib" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_Foundation.lib" />
</Component>

<Component Directory="Testing.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
</Component>
<Component Directory="Testing.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
</Component>

<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
</Component>
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
</Component>
</ComponentGroup>
<?endif?>
<?if $(IncludeX86) = True?>
<ComponentGroup Id="Testing.x86">
<Component Directory="Testing_usr_bin32" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\Testing.dll" />
</Component>
<Component Directory="Testing_usr_bin32" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_Foundation.dll" />
</Component>

<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\Testing.lib" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_Foundation.lib" />
</Component>

<Component Directory="Testing.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
</Component>
<Component Directory="Testing.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
</Component>

<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
</Component>
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
</Component>
</ComponentGroup>
<?endif?>

Expand Down Expand Up @@ -1666,6 +1718,8 @@
<ComponentGroupRef Id="_FoundationUnicode" />
<ComponentGroupRef Id="_FoundationCShims" />

<ComponentGroupRef Id="Testing" />

<ComponentGroupRef Id="AuxiliaryFiles" />
<ComponentGroupRef Id="Configuration" />
<ComponentGroupRef Id="SwiftShims" />
Expand Down