Skip to content

Commit c283d62

Browse files
compnerdcompnerd
committed
WiX: rewrite the package identities
Restructure the packaging to be more homogeneous and concise. - Swift Developer Kit - Swift Compiler Tools (AMD64|ARM64) - Swift Developer Tools (AMD64|ARM64) - Swift Windows Runtime (AMD64|ARM64|IA32) - Swift Windows SDK (AMD64|ARM64|IA32) 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.
1 parent a22a5bb commit c283d62

12 files changed

+32
-32
lines changed

‎platforms/Windows/devtools-amd64.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift Developer Tools for Windows x86_64"
5+
Name="Swift Developer Tools (AMD64)"
66
UpgradeCode="5778fa7a-f1a6-4133-b4e0-fc0d9caf4544"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift Developer Tools for Windows x86_64" />
9+
<SummaryInformation Description="Swift Developer Tools (AMD64)" />
1010

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

@@ -138,7 +138,7 @@
138138
</Component>
139139
</ComponentGroup>
140140

141-
<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)">
141+
<Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools (AMD64)" Level="1" Title="Swift Developer Tools (AMD64)">
142142
<ComponentGroupRef Id="SwiftCollections" />
143143
<ComponentGroupRef Id="SwiftSystem" />
144144
<ComponentGroupRef Id="SwiftPackageManager" />

‎platforms/Windows/devtools-arm64.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift Developer Tools for Windows aarch64"
5+
Name="Swift Developer Tools (ARM64)"
66
UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift Developer Tools for Windows aarch64" />
9+
<SummaryInformation Description="Swift Developer Tools (ARM64)" />
1010

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

@@ -138,7 +138,7 @@
138138
</Component>
139139
</ComponentGroup>
140140

141-
<Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools for Windows aarch64" Level="1" Title="Swift Developer Tools (Windows aarch64)">
141+
<Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools (ARM64)" Level="1" Title="Swift Developer Tools (ARM64)">
142142
<ComponentGroupRef Id="SwiftCollections" />
143143
<ComponentGroupRef Id="SwiftSystem" />
144144
<ComponentGroupRef Id="SwiftPackageManager" />

‎platforms/Windows/installer-amd64.wxs

Lines changed: 1 addition & 1 deletion
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 Developer 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

Lines changed: 1 addition & 1 deletion
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 Developer 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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift Runtime for Windows x86_64"
5+
Name="Swift Windows Runtime (AMD64)"
66
UpgradeCode="850349e4-5a24-44eb-bded-f49a2709d26f"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift Runtime for Windows x86_64" />
9+
<SummaryInformation Description="Swift Windows Runtime (AMD64)" />
1010

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

@@ -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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift Runtime for Windows aarch64"
5+
Name="Swift Windows Runtime (ARM64)"
66
UpgradeCode="bea8c6dc-f73e-445b-9486-2333d1cf2886"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift Runtime for Windows aarch64" />
9+
<SummaryInformation Description="Swift Windows Runtime (ARM64)" />
1010

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

@@ -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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift Runtime for Windows i686"
5+
Name="Swift Windows Runtime (IA32)"
66
UpgradeCode="01a3fe60-8c3e-4249-8477-deba39b99dd9"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift Runtime for Windows i686" />
9+
<SummaryInformation Description="Swift Windows Runtime (IA32)" />
1010

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

@@ -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 (IA32)" Level="1" Title="Swift Windows Runtime (IA32)">
9898
<ComponentGroupRef Id="SwiftRuntime" />
9999
<ComponentRef Id="EnvironmentVariables" />
100100
</Feature>

‎platforms/Windows/sdk-amd64.wxs

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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 (IA32)"
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 (IA32)" />
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 (IA32)" Level="1" Title="Swift Windows SDK (IA32)">
482482
<ComponentGroupRef Id="BlocksRuntime" />
483483
<ComponentGroupRef Id="CRT" />
484484
<ComponentGroupRef Id="CXX" />

‎platforms/Windows/toolchain-amd64.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift Toolchain for Windows x86_64"
5+
Name="Swift Compiler Tools (AMD64)"
66
UpgradeCode="9871289b-f9cb-4b39-8122-2c7ec1ab24d5"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift Toolchain for Windows x86_64" />
9+
<SummaryInformation Description="Swift Compiler Tools (AMD64)" />
1010

1111
<!--
1212
NOTE(compnerd) Use high compression as this is an extrodinarily large
@@ -547,7 +547,7 @@
547547
<Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" />
548548
</Component>
549549

550-
<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">
550+
<Feature Id="Toolchain" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Compiler Tools (AMD64)" Level="1" Title="Swift Compiler Tools (AMD64)">
551551
<ComponentGroupRef Id="binutils" />
552552
<ComponentGroupRef Id="clang" />
553553
<ComponentGroupRef Id="lld" />

‎platforms/Windows/toolchain-arm64.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Package
33
Language="1033"
44
Manufacturer="swift.org"
5-
Name="Swift Toolchain for Windows aarch64"
5+
Name="Swift Compiler Tools (ARM64)"
66
UpgradeCode="7e95dc06-7f84-4e8e-a038-8304af0468fb"
77
Version="$(var.ProductVersion)"
88
Scope="perMachine">
9-
<SummaryInformation Description="Swift Toolchain for Windows aarch64" />
9+
<SummaryInformation Description="Swift Compiler Tools (ARM64)" />
1010

1111
<!--
1212
NOTE(compnerd) Use high compression as this is an extrodinarily large
@@ -547,7 +547,7 @@
547547
<Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" />
548548
</Component>
549549

550-
<Feature Id="Toolchain" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Toolchain for Windows aarch64" Level="1" Title="Swift Toolchain for Windows aarch64">
550+
<Feature Id="Toolchain" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Compiler Tools (ARM64)" Level="1" Title="Swift Compiler Tools (ARM64)">
551551
<ComponentGroupRef Id="binutils" />
552552
<ComponentGroupRef Id="clang" />
553553
<ComponentGroupRef Id="lld" />

0 commit comments

Comments
 (0)