Skip to content

Commit af89b7b

Browse files
compnerdcompnerd
authored
WiX: rewrite the package identities (swiftlang#196)
Restructure the packaging to be more homogeneous and concise. - Swift Software Development Kit * Swift Compiler Tools * Swift Developer Tools * Swift Windows Runtime (AMD64|ARM64|x86) * Swift Windows SDK (AMD64|ARM64|x86) This gives a more concise description that is also easier to understand and map. This sets up the path for further refinement of the installer to provide more control over the installed components. We do not suffix the Software Development Kit nor Compiler and Developer Tools as there will be a singular version that matches the host that is installed. Therefore, there is no value in differentiating that. However, multiple SDKs and Runtimes may be present, so identify the architecture for them.
1 parent 8939baf commit af89b7b

12 files changed

+32
-32
lines changed

‎platforms/Windows/devtools-amd64.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Package
44
Language="1033"
55
Manufacturer="swift.org"
6-
Name="Swift Developer Tools for Windows x86_64"
6+
Name="Swift Developer Tools"
77
UpgradeCode="5778fa7a-f1a6-4133-b4e0-fc0d9caf4544"
88
Version="$(var.ProductVersion)"
99
Scope="perMachine">
10-
<SummaryInformation Description="Swift Developer Tools for Windows x86_64" />
10+
<SummaryInformation Description="Swift Developer Tools" />
1111

1212
<Media Id="1" Cabinet="devtools.cab" EmbedCab="yes" />
1313

@@ -152,7 +152,7 @@
152152
</Component>
153153
</ComponentGroup>
154154

155-
<Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools for Windows x86_64" Level="1" Title="Swift Developer Tools (Windows x86_64)">
155+
<Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools" Level="1" Title="Swift Developer Tools">
156156
<ComponentGroupRef Id="SwiftCollections" />
157157
<ComponentGroupRef Id="SwiftSystem" />
158158
<ComponentGroupRef Id="SwiftPackageManager" />

‎platforms/Windows/devtools-arm64.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Package
44
Language="1033"
55
Manufacturer="swift.org"
6-
Name="Swift Developer Tools for Windows aarch64"
6+
Name="Swift Developer Tools"
77
UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89"
88
Version="$(var.ProductVersion)"
99
Scope="perMachine">
10-
<SummaryInformation Description="Swift Developer Tools for Windows aarch64" />
10+
<SummaryInformation Description="Swift Developer Tools" />
1111

1212
<Media Id="1" Cabinet="devtools.cab" EmbedCab="yes" />
1313

@@ -152,7 +152,7 @@
152152
</Component>
153153
</ComponentGroup>
154154

155-
<Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools for Windows aarch64" Level="1" Title="Swift Developer Tools (Windows aarch64)">
155+
<Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools" Level="1" Title="Swift Developer Tools">
156156
<ComponentGroupRef Id="SwiftCollections" />
157157
<ComponentGroupRef Id="SwiftSystem" />
158158
<ComponentGroupRef Id="SwiftPackageManager" />

‎platforms/Windows/installer-amd64.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2-
<Bundle Name="Swift Developer Package for Windows x86_64" Version="$(var.ProductVersion)" Manufacturer="swift.org" UpgradeCode="8c75f32a-7bdf-4c61-abf6-c7e1c4b8fbf6">
2+
<Bundle Name="Swift Software Development Kit" Version="$(var.ProductVersion)" Manufacturer="swift.org" UpgradeCode="8c75f32a-7bdf-4c61-abf6-c7e1c4b8fbf6">
33
<BootstrapperApplication>
44
<bal:WixStandardBootstrapperApplication LicenseUrl="" LogoFile="Resources/swift.png" SuppressOptionsUI="yes" SuppressRepair="no" Theme="hyperlinkLicense" />
55
</BootstrapperApplication>

‎platforms/Windows/installer-arm64.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2-
<Bundle Name="Swift Developer Package for Windows aarch64" Version="$(var.ProductVersion)" Manufacturer="swift.org" UpgradeCode="151d42d9-8877-4b72-ac62-4695243a35c1">
2+
<Bundle Name="Swift Software Development Kit" Version="$(var.ProductVersion)" Manufacturer="swift.org" UpgradeCode="151d42d9-8877-4b72-ac62-4695243a35c1">
33
<BootstrapperApplication>
44
<bal:WixStandardBootstrapperApplication LicenseUrl="" LogoFile="Resources/swift.png" SuppressOptionsUI="yes" SuppressRepair="no" Theme="hyperlinkLicense" />
55
</BootstrapperApplication>

‎platforms/Windows/runtime-amd64.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Package
44
Language="1033"
55
Manufacturer="swift.org"
6-
Name="Swift Runtime for Windows x86_64"
6+
Name="Swift Windows Runtime (AMD64)"
77
UpgradeCode="850349e4-5a24-44eb-bded-f49a2709d26f"
88
Version="$(var.ProductVersion)"
99
Scope="perMachine">
10-
<SummaryInformation Description="Swift Runtime for Windows x86_64" />
10+
<SummaryInformation Description="Swift Windows Runtime (AMD64)" />
1111

1212
<Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" />
1313

@@ -94,7 +94,7 @@
9494
</Component>
9595

9696
<!-- Feature -->
97-
<Feature Id="WinX64SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Runtime for Windows x86_64" Level="1" Title="Swift Runtime for Windows x86_64">
97+
<Feature Id="WinX64SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime (AMD64)" Level="1" Title="Swift Windows Runtime (AMD64)">
9898
<ComponentGroupRef Id="SwiftRuntime" />
9999
<ComponentRef Id="EnvironmentVariables" />
100100
</Feature>

‎platforms/Windows/runtime-arm64.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Package
44
Language="1033"
55
Manufacturer="swift.org"
6-
Name="Swift Runtime for Windows aarch64"
6+
Name="Swift Windows Runtime (ARM64)"
77
UpgradeCode="bea8c6dc-f73e-445b-9486-2333d1cf2886"
88
Version="$(var.ProductVersion)"
99
Scope="perMachine">
10-
<SummaryInformation Description="Swift Runtime for Windows aarch64" />
10+
<SummaryInformation Description="Swift Windows Runtime (ARM64)" />
1111

1212
<Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" />
1313

@@ -94,7 +94,7 @@
9494
</Component>
9595

9696
<!-- Feature -->
97-
<Feature Id="WinARM64SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Runtime for Windows aarch64" Level="1" Title="Swift Runtime for Windows aarch64">
97+
<Feature Id="WinARM64SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime (ARM64)" Level="1" Title="Swift Windows Runtime (ARM64)">
9898
<ComponentGroupRef Id="SwiftRuntime" />
9999
<ComponentRef Id="EnvironmentVariables" />
100100
</Feature>

‎platforms/Windows/runtime-x86.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Package
44
Language="1033"
55
Manufacturer="swift.org"
6-
Name="Swift Runtime for Windows i686"
6+
Name="Swift Windows Runtime (x86)"
77
UpgradeCode="01a3fe60-8c3e-4249-8477-deba39b99dd9"
88
Version="$(var.ProductVersion)"
99
Scope="perMachine">
10-
<SummaryInformation Description="Swift Runtime for Windows i686" />
10+
<SummaryInformation Description="Swift Windows Runtime (x86)" />
1111

1212
<Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" />
1313

@@ -94,7 +94,7 @@
9494
</Component>
9595

9696
<!-- Feature -->
97-
<Feature Id="Win32SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Runtime for Windows i686" Level="1" Title="Swift Runtime for Windows i686">
97+
<Feature Id="Win32SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime (x86)" Level="1" Title="Swift Windows Runtime (x86)">
9898
<ComponentGroupRef Id="SwiftRuntime" />
9999
<ComponentRef Id="EnvironmentVariables" />
100100
</Feature>

‎platforms/Windows/sdk-amd64.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift SDK for Windows x86_64"
5+
Name="Swift Windows SDK (AMD64)"
66
UpgradeCode="83af0249-2b57-4ce1-8121-c29c6c555225"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift SDK for Windows x86_64" />
9+
<SummaryInformation Description="Swift Windows SDK (AMD64)" />
1010

1111
<Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" />
1212

@@ -484,7 +484,7 @@
484484
</Component>
485485

486486
<!-- Features -->
487-
<Feature Id="WinX64SDK" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift SDK for Windows x86_64" Level="1" Title="Swift SDK for Windows x86_64" AllowAbsent="no">
487+
<Feature Id="WinX64SDK" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows SDK (AMD64)" Level="1" Title="Swift Windows SDK (AMD64)" AllowAbsent="no">
488488
<ComponentGroupRef Id="BlocksRuntime" />
489489
<ComponentGroupRef Id="CRT" />
490490
<ComponentGroupRef Id="CXX" />

‎platforms/Windows/sdk-arm64.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift SDK for Windows aarch64"
5+
Name="Swift Windows SDK (ARM64)"
66
UpgradeCode="4c37a396-d9e2-490a-89b7-0a3d271d847f"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift SDK for Windows aarch64" />
9+
<SummaryInformation Description="Swift Windows SDK (ARM64)" />
1010

1111
<Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" />
1212

@@ -484,7 +484,7 @@
484484
</Component>
485485

486486
<!-- Features -->
487-
<Feature Id="WinARM64SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift SDK for Windows aarch64" Level="1" Title="Swift SDK for Windows aarch64">
487+
<Feature Id="WinARM64SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows SDK (ARM64)" Level="1" Title="Swift Windows SDK (ARM64)">
488488
<ComponentGroupRef Id="BlocksRuntime" />
489489
<ComponentGroupRef Id="CRT" />
490490
<ComponentGroupRef Id="CXX" />

‎platforms/Windows/sdk-x86.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift SDK for Windows i686"
5+
Name="Swift Windows SDK (x86)"
66
UpgradeCode="7ab082f9-cd6d-480e-9a97-4186782c3db0"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift SDK for Windows i686" />
9+
<SummaryInformation Description="Swift Windows SDK (x86)" />
1010

1111
<Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" />
1212

@@ -478,7 +478,7 @@
478478

479479

480480
<!-- Features -->
481-
<Feature Id="Win32SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift SDK for Windows i686" Level="1" Title="Swift SDK for Windows i686">
481+
<Feature Id="Win32SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows SDK (x86)" Level="1" Title="Swift Windows SDK (x86)">
482482
<ComponentGroupRef Id="BlocksRuntime" />
483483
<ComponentGroupRef Id="CRT" />
484484
<ComponentGroupRef Id="CXX" />

‎platforms/Windows/toolchain-amd64.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Package
44
Language="1033"
55
Manufacturer="swift.org"
6-
Name="Swift Toolchain for Windows x86_64"
6+
Name="Swift Compiler Tools"
77
UpgradeCode="9871289b-f9cb-4b39-8122-2c7ec1ab24d5"
88
Version="$(var.ProductVersion)"
99
Scope="perMachine">
10-
<SummaryInformation Description="Swift Toolchain for Windows x86_64" />
10+
<SummaryInformation Description="Swift Compiler Tools" />
1111

1212
<!--
1313
NOTE(compnerd) Use high compression as this is an extrodinarily large
@@ -539,7 +539,7 @@
539539
<Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Toolchains\$(var.ToolchainName)\usr\bin" />
540540
</Component>
541541

542-
<Feature Id="Toolchain" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Toolchain for Windows x86_64" Level="1" Title="Swift Toolchain for Windows x86_64">
542+
<Feature Id="Toolchain" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Compiler Tools" Level="1" Title="Swift Compiler Tools">
543543
<ComponentGroupRef Id="binutils" />
544544
<ComponentGroupRef Id="clang" />
545545
<ComponentGroupRef Id="lld" />

‎platforms/Windows/toolchain-arm64.wxs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Package
44
Language="1033"
55
Manufacturer="swift.org"
6-
Name="Swift Toolchain for Windows aarch64"
6+
Name="Swift Compiler Tools"
77
UpgradeCode="7e95dc06-7f84-4e8e-a038-8304af0468fb"
88
Version="$(var.ProductVersion)"
99
Scope="perMachine">
10-
<SummaryInformation Description="Swift Toolchain for Windows aarch64" />
10+
<SummaryInformation Description="Swift Compiler Tools" />
1111

1212
<!--
1313
NOTE(compnerd) Use high compression as this is an extrodinarily large
@@ -539,7 +539,7 @@
539539
<Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Toolchains\$(var.ToolchainName)\usr\bin" />
540540
</Component>
541541

542-
<Feature Id="Toolchain" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Toolchain for Windows aarch64" Level="1" Title="Swift Toolchain for Windows aarch64">
542+
<Feature Id="Toolchain" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Compiler Tools" Level="1" Title="Swift Compiler Tools">
543543
<ComponentGroupRef Id="binutils" />
544544
<ComponentGroupRef Id="clang" />
545545
<ComponentGroupRef Id="lld" />

0 commit comments

Comments
 (0)