Skip to content

Commit 74f3c94

Browse files
committed
WiX: package up the cross-module overlay
This adds the swift-testing cross-module overlay to the distribution on Windows.
1 parent 8140d27 commit 74f3c94

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

platforms/Windows/sdk/drd/sdk.wxs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@
8383
<Directory Name="lib">
8484
<Directory Name="swift">
8585
<Directory Name="android">
86+
<Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
8687
<Directory Id="Testing_usr_lib_swift_android_ARCH" Name="$(Architecture)" />
88+
<Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
8789
<Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
8890
</Directory>
8991
</Directory>
@@ -162,9 +164,21 @@
162164
</ComponentGroup>
163165

164166
<ComponentGroup Id="Testing">
167+
<Component Directory="_Testing_Foundation.swiftmodule">
168+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\$(Triple).swiftdoc" />
169+
</Component>
170+
<Component Directory="_Testing_Foundation.swiftmodule">
171+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\$(Triple).swiftinterface" />
172+
</Component>
165173
<Component Directory="Testing_usr_lib_swift_android_ARCH">
166174
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\$(Architecture)\libTesting.so" />
167175
</Component>
176+
<Component Directory="Testing_usr_lib_swift_android_ARCH">
177+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVerison)\usr\lib\swift\android\$(Architecture)\lib_Testing_Foundation.so" />
178+
</Component>
179+
<Component Directory="Testing.swiftcrossimport">
180+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
181+
</Component>
168182
<Component Directory="Testing.swiftmodule">
169183
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftdoc" />
170184
</Component>

platforms/Windows/sdk/win/sdk.wxs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@
7171
<Directory Name="lib">
7272
<Directory Name="swift">
7373
<Directory Name="windows">
74+
<Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
7475
<Directory Id="Testing_usr_lib_swift_windows_ARCH" Name="$(Architecture)" />
76+
<Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
7577
<Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
7678
</Directory>
7779
</Directory>
@@ -147,12 +149,24 @@
147149
</ComponentGroup>
148150

149151
<ComponentGroup Id="Testing">
152+
<Component Directory="_Testing_Foundation.swiftmodule">
153+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\$(Triple).swiftdoc" />
154+
</Component>
155+
<Component Directory="_Testing_Foundation.swiftmodule">
156+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\$(Triple).swiftinterface" />
157+
</Component>
150158
<Component Directory="Testing_usr_bin">
151159
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\$(ArchitectureBinaryDir)\Testing.dll" />
152160
</Component>
153161
<Component Directory="Testing_usr_lib_swift_windows_ARCH">
154162
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\$(Architecture)\Testing.lib" />
155163
</Component>
164+
<Component Directory="Testing_usr_lib_swift_windows_ARCH">
165+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\$(Architecture)\_Testing_Foundation.lib" />
166+
</Component>
167+
<Component Directory="Testing.swiftcrossimport">
168+
<File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
169+
</Component>
156170
<Component Directory="Testing.swiftmodule">
157171
<File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftdoc" />
158172
</Component>

0 commit comments

Comments
 (0)