Skip to content

Commit 31da88c

Browse files
compnerdcompnerd
committed
WiX: remove extraneous architecture in search path
Adjust the location of the swift modules to overlap across SDKs. The directory form of the swift module can easily overlap and co-exist. Now that the driver has learnt to scan the non-architecture dependent location in addition to the architecture location dependent path, we can unify the swiftmodule content in the SDK to a simpler layout. The layout now is: ~~~ SDKROOT `- usr `- lib `- swift `- [platform] +- [module].swiftmodule | `- [triple].{swiftdoc,swiftmodule,swiftinterface} `- [arch] `- [import library] ~~~ On Windows, it would be preferable to further remove the intermediate platform as we have that information earlier in the path. Subsequent work remains to now ensure that the package manager will similarly allow the XCTest swift modules to collapse. While in theory it is possible to create a multi-architecture import library, it is valuable to support user-selectable SDK installation which requires that the we create the import libraries on the fly for the selected architectures. It is more convenient from a distribution perspective to simply make the content static and as such continue to use the architect dependent directory for the import library unlike the swift module. This is dependent on swiftlang/swift#42419.
1 parent b3555f4 commit 31da88c

File tree

2 files changed

+52
-52
lines changed

2 files changed

+52
-52
lines changed

‎platforms/Windows/sdk-amd64.wxs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -62,33 +62,33 @@
6262
<Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
6363
</Directory>
6464
<Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
65+
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
66+
</Directory>
67+
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
68+
</Directory>
69+
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
70+
</Directory>
71+
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
72+
</Directory>
73+
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
74+
</Directory>
75+
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
76+
</Directory>
77+
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
78+
</Directory>
79+
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
80+
</Directory>
81+
<Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
82+
</Directory>
83+
<Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
84+
</Directory>
85+
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
86+
</Directory>
87+
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
88+
</Directory>
89+
<Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
90+
</Directory>
6591
<Directory Id="WindowsSDK_usr_lib_swift_windows_x86_64" Name="x86_64">
66-
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
67-
</Directory>
68-
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
69-
</Directory>
70-
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
71-
</Directory>
72-
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
73-
</Directory>
74-
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
75-
</Directory>
76-
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
77-
</Directory>
78-
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
79-
</Directory>
80-
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
81-
</Directory>
82-
<Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
83-
</Directory>
84-
<Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
85-
</Directory>
86-
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
87-
</Directory>
88-
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
89-
</Directory>
90-
<Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
91-
</Directory>
9292
</Directory>
9393
</Directory>
9494
</Directory>

‎platforms/Windows/sdk-x86.wxs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -62,33 +62,33 @@
6262
<Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
6363
</Directory>
6464
<Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
65+
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
66+
</Directory>
67+
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
68+
</Directory>
69+
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
70+
</Directory>
71+
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
72+
</Directory>
73+
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
74+
</Directory>
75+
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
76+
</Directory>
77+
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
78+
</Directory>
79+
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
80+
</Directory>
81+
<Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
82+
</Directory>
83+
<Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
84+
</Directory>
85+
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
86+
</Directory>
87+
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
88+
</Directory>
89+
<Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
90+
</Directory>
6591
<Directory Id="WindowsSDK_usr_lib_swift_windows_i686" Name="i686">
66-
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
67-
</Directory>
68-
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
69-
</Directory>
70-
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
71-
</Directory>
72-
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
73-
</Directory>
74-
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
75-
</Directory>
76-
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
77-
</Directory>
78-
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
79-
</Directory>
80-
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
81-
</Directory>
82-
<Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
83-
</Directory>
84-
<Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
85-
</Directory>
86-
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
87-
</Directory>
88-
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
89-
</Directory>
90-
<Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
91-
</Directory>
9292
</Directory>
9393
</Directory>
9494
</Directory>

0 commit comments

Comments
 (0)