Skip to content

Commit 9f1149a

Browse files
committed
WiX: remove SwiftCrypto from the installer manifest
Remove the swift-crypto contents from the installer manifest as this library can be built statically and linked accordingly into SPM as there is a single consumer of it. This will help reduce the binary size.
1 parent bffd3ed commit 9f1149a

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

platforms/Windows/devtools-amd64.wxs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,6 @@
4040
</SetDirectory>
4141

4242
<!-- Components -->
43-
<ComponentGroup Id="SwiftCrypto">
44-
<Component Id="Crypto.dll" Directory="_usr_bin" Guid="da28dfe3-2af0-45fb-b877-a5ef37da48cd">
45-
<File Id="Crypto.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Crypto.dll" Checksum="yes" />
46-
</Component>
47-
</ComponentGroup>
48-
49-
<?ifdef INCLUDE_DEBUG_INFO ?>
50-
<ComponentGroup Id="SwiftCryptoDebugInfo">
51-
<Component Id="Crypto.pdb" Directory="_usr_bin" Guid="e977250f-2ed1-4fd5-adb0-e4d7c0a9fbfd">
52-
<File Id="Crypto.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Crypto.pdb" Checksum="yes" />
53-
</Component>
54-
</ComponentGroup>
55-
<?endif?>
56-
5743
<ComponentGroup Id="SwiftCollections">
5844
<Component Id="Collections.dll" Directory="_usr_bin" Guid="fd0862f1-2e80-4040-8736-b73fc9c4230d">
5945
<File Id="Collections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Collections.dll" Checksum="yes" />
@@ -237,7 +223,6 @@
237223
<?endif?>
238224

239225
<Feature Id="DeveloperTools" Absent="disallow" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools for Windows x86_64" Level="1" Title="Swift Developer Tools (Windows x86_64)">
240-
<ComponentGroupRef Id="SwiftCrypto" />
241226
<ComponentGroupRef Id="SwiftCollections" />
242227
<ComponentGroupRef Id="SwiftSystem" />
243228
<ComponentGroupRef Id="SwiftPackageManager" />
@@ -246,7 +231,6 @@
246231
<?ifdef INCLUDE_DEBUG_INFO ?>
247232
<Feature Id="DebugInfo" Absent="allow" AllowAdvertise="yes" Description="Debug Information for Swift Developer Tools for Windows x86_64" Level="0" Title="Debug Info">
248233
<Condition Level="1">INSTALL_DEBUGINFO</Condition>
249-
<ComponentGroupRef Id="SwiftCryptoDebugInfo" />
250234
<ComponentGroupRef Id="SwiftCollectionsDebugInfo" />
251235
<ComponentGroupRef Id="SwiftSystemDebugInfo" />
252236
<ComponentGroupRef Id="SwiftPackageManagerDebugInfo" />

platforms/Windows/devtools-arm64.wxs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,6 @@
4040
</SetDirectory>
4141

4242
<!-- Components -->
43-
<ComponentGroup Id="SwiftCrypto">
44-
<Component Id="Crypto.dll" Directory="_usr_bin" Guid="b70fbf9e-006b-4b05-9450-8b139fa90da1">
45-
<File Id="Crypto.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Crypto.dll" Checksum="yes" />
46-
</Component>
47-
</ComponentGroup>
48-
49-
<?ifdef INCLUDE_DEBUG_INFO ?>
50-
<ComponentGroup Id="SwiftCryptoDebugInfo">
51-
<Component Id="Crypto.pdb" Directory="_usr_bin" Guid="13765cd7-5212-4ce8-a3f0-83168b4e8afc">
52-
<File Id="Crypto.pdb" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Crypto.pdb" Checksum="yes" />
53-
</Component>
54-
</ComponentGroup>
55-
<?endif?>
56-
5743
<ComponentGroup Id="SwiftCollections">
5844
<Component Id="Collections.dll" Directory="_usr_bin" Guid="b705e7a1-698a-4608-b53f-48578380696c">
5945
<File Id="Collections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Collections.dll" Checksum="yes" />
@@ -237,7 +223,6 @@
237223
<?endif?>
238224

239225
<Feature Id="DeveloperTools" Absent="disallow" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools for Windows aarch64" Level="1" Title="Swift Developer Tools (Windows aarch64)">
240-
<ComponentGroupRef Id="SwiftCrypto" />
241226
<ComponentGroupRef Id="SwiftCollections" />
242227
<ComponentGroupRef Id="SwiftSystem" />
243228
<ComponentGroupRef Id="SwiftPackageManager" />
@@ -246,7 +231,6 @@
246231
<?ifdef INCLUDE_DEBUG_INFO ?>
247232
<Feature Id="DebugInfo" Absent="allow" AllowAdvertise="yes" Description="Debug Information for Swift Developer Tools for Windows aarch64" Level="0" Title="Debug Info">
248233
<Condition Level="1">INSTALL_DEBUGINFO</Condition>
249-
<ComponentGroupRef Id="SwiftCryptoDebugInfo" />
250234
<ComponentGroupRef Id="SwiftCollectionsDebugInfo" />
251235
<ComponentGroupRef Id="SwiftSystemDebugInfo" />
252236
<ComponentGroupRef Id="SwiftPackageManagerDebugInfo" />

0 commit comments

Comments
 (0)