Skip to content

Commit 6c37fd9

Browse files
committed
WiX: correct component references
There were references to components which have been converted to `ComponentGroup`s to enable repairs to reinstall files when necessary. This requires that the references be updated as well. Due to the inability to include debug info, we did not catch the issues in the ARM64 and AMD64 cases, and the X86 builds are not enabled on swift.org yet.
1 parent 02be3d2 commit 6c37fd9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

platforms/Windows/runtime-amd64.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<?ifdef INCLUDE_DEBUG_INFO ?>
178178
<Feature Id="DebugInfo" Absent="allow" AllowAdvertise="yes" Description="Debug Information for Swift Utilties for Windows x86_64" Level="0" Title="Debug Information">
179179
<Condition Level="1">INSTALL_DEBUGINFO</Condition>
180-
<ComponentRef Id="SwiftUtilitiesDebugInfo" />
180+
<ComponentGroupRef Id="SwiftUtilitiesDebugInfo" />
181181
</Feature>
182182
<?endif?>
183183
</Feature>

platforms/Windows/runtime-arm64.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<?ifdef INCLUDE_DEBUG_INFO ?>
178178
<Feature Id="DebugInfo" Absent="allow" AllowAdvertise="yes" Description="Debug Information for Swift Utilties for Windows aarch64" Level="0" Title="Debug Information">
179179
<Condition Level="1">INSTALL_DEBUGINFO</Condition>
180-
<ComponentRef Id="SwiftUtilitiesDebugInfo" />
180+
<ComponentGroupRef Id="SwiftUtilitiesDebugInfo" />
181181
</Feature>
182182
<?endif?>
183183
</Feature>

platforms/Windows/runtime-x86.wxs

+4-4
Original file line numberDiff line numberDiff line change
@@ -159,24 +159,24 @@
159159

160160
<!-- Feature -->
161161
<Feature Id="Win32SwiftRuntime" Absent="disallow" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Runtime for Windows i686" Level="1" Title="Swift Runtime for Windows i686">
162-
<ComponentRef Id="SwiftRuntime" />
162+
<ComponentGroupRef Id="SwiftRuntime" />
163163
<ComponentRef Id="EnvironmentVariables" />
164164

165165
<?ifdef INCLUDE_DEBUG_INFO ?>
166166
<Feature Id="DebugInfo" Absent="allow" AllowAdvertise="yes" Description="Debug Information for Swift Runtime for Windows i686" Level="0" Title="Debug Information">
167167
<Condition Level="1">INSTALL_DEBUGINFO</Condition>
168-
<ComponentRef Id="SwiftRuntimeDebugInfo" />
168+
<ComponentGroupRef Id="SwiftRuntimeDebugInfo" />
169169
</Feature>
170170
<?endif?>
171171
</Feature>
172172

173173
<Feature Id="Win32SwiftUtilities" Absent="allow" AllowAdvertise="yes" Description="Extra Swift Utilities for Windows i686" Level="1" Title="Swift Utilities for Windows i686">
174-
<ComponentRef Id="SwiftUtilities" />
174+
<ComponentGroupRef Id="SwiftUtilities" />
175175

176176
<?ifdef INCLUDE_DEBUG_INFO ?>
177177
<Feature Id="DebugInfo" Absent="allow" AllowAdvertise="yes" Description="Debug Information for Swift Utilties for Windows x86_64" Level="0" Title="Debug Information">
178178
<Condition Level="1">INSTALL_DEBUGINFO</Condition>
179-
<ComponentRef Id="SwiftUtilitiesDebugInfo" />
179+
<ComponentGroupRef Id="SwiftUtilitiesDebugInfo" />
180180
</Feature>
181181
<?endif?>
182182
</Feature>

0 commit comments

Comments
 (0)