Skip to content

Commit 97bbe30

Browse files
compnerdcompnerd
committed
WiX: adjust SDK handling for homogeneity
Uniformly use `sdk.[os].[arch].{msi,cab}` for the name of the files and `INCLUDE_[os]_[arch]_SDK` to indicate that the SDK should be included. This makes both Windows and Android similar in their handling and naming.
1 parent 80d9619 commit 97bbe30

File tree

7 files changed

+93
-81
lines changed

7 files changed

+93
-81
lines changed

‎platforms/Windows/android_sdk/android_sdk.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="WixToolset.Sdk/4.0.5">
22
<PropertyGroup>
3-
<OutputName>android_sdk.$(ProductArchitecture)</OutputName>
3+
<OutputName>sdk.android.$(ProductArchitecture)</OutputName>
44
<Platform>x86</Platform>
55

66
<SwiftShimsPath>$(SDK_ROOT)\usr\lib\swift\shims</SwiftShimsPath>

‎platforms/Windows/android_sdk/android_sdk.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
Version="$(NonSemVerProductVersion)"
4141
Scope="$(PackageScope)">
4242

43-
<Media Id="1" Cabinet="android_sdk.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
43+
<Media Id="1" Cabinet="sdk.android.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
4444

4545
<WixVariable Id="SideBySidePackageUpgradeCode" Value="$(AndroidSDKUpgradeCode)" />
4646

‎platforms/Windows/bundle/installer.wixproj

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<VCRedistDownloadUrl Condition=" '$(VCRedistDownloadUrl)' == '' AND '$(VSMajorVersion)' != '' ">https://aka.ms/vs/$(VSMajorVersion)/release/vc_redist.$(ProductArchitecture).exe</VCRedistDownloadUrl>
77
<DefineConstants>
88
$(DefineConstants);
9-
INCLUDE_AMD64_SDK=$(INCLUDE_AMD64_SDK);
10-
INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
11-
INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
12-
ANDROID_INCLUDE_ARM64_SDK=$(ANDROID_INCLUDE_ARM64_SDK);
13-
ANDROID_INCLUDE_x86_64_SDK=$(ANDROID_INCLUDE_x86_64_SDK);
14-
ANDROID_INCLUDE_ARM_SDK=$(ANDROID_INCLUDE_ARM_SDK);
15-
ANDROID_INCLUDE_X86_SDK=$(ANDROID_INCLUDE_X86_SDK);
9+
INCLUDE_ANDROID_ARM_SDK=$(INCLUDE_ANDROID_ARM_SDK);
10+
INCLUDE_ANDROID_ARM64_SDK=$(INCLUDE_ANDROID_ARM64_SDK);
11+
INCLUDE_ANDROID_X86_SDK=$(INCLUDE_ANDROID_X86_SDK);
12+
INCLUDE_ANDROID_X86_64_SDK=$(INCLUDE_ANDROID_X86_64_SDK);
13+
INCLUDE_WINDOWS_AMD64_SDK=$(INCLUDE_WINDOWS_AMD64_SDK);
14+
INCLUDE_WINDOWS_ARM64_SDK=$(INCLUDE_WINDOWS_ARM64_SDK);
15+
INCLUDE_WINDOWS_X86_SDK=$(INCLUDE_WINDOWS_X86_SDK);
1616
</DefineConstants>
1717
</PropertyGroup>
1818

@@ -28,31 +28,31 @@
2828
<ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
2929
</ItemGroup>
3030

31-
<ItemGroup Condition=" '$(INCLUDE_AMD64_SDK)' != '' ">
32-
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="sdk_amd64" />
31+
<ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM_SDK)' != '' ">
32+
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_armv7_sdk" />
3333
</ItemGroup>
3434

35-
<ItemGroup Condition=" '$(INCLUDE_ARM64_SDK)' != '' ">
36-
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="sdk_arm64" />
35+
<ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM64_SDK)' != '' ">
36+
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_aarch64_sdk" />
3737
</ItemGroup>
3838

39-
<ItemGroup Condition=" '$(INCLUDE_X86_SDK)' != '' ">
40-
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="sdk_x86" />
39+
<ItemGroup Condition=" '$(INCLUDE_ANDROID_X86_SDK)' != '' ">
40+
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_i686_sdk" />
4141
</ItemGroup>
4242

43-
<ItemGroup Condition=" '$(ANDROID_INCLUDE_ARM64_SDK)' != '' ">
44-
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_sdk_aarch64" />
43+
<ItemGroup Condition=" '$(INCLUDE_ANDROID_x86_64_SDK)' != '' ">
44+
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=x86_64;Platform=x86" BindName="android_x86_64_sdk" />
4545
</ItemGroup>
4646

47-
<ItemGroup Condition=" '$(ANDROID_INCLUDE_x86_64_SDK)' != '' ">
48-
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=x86_64;Platform=x86" BindName="android_sdk_x86_64" />
47+
<ItemGroup Condition=" '$(INCLUDE_WINDOWS_AMD64_SDK)' != '' ">
48+
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="windows_amd64_sdk" />
4949
</ItemGroup>
5050

51-
<ItemGroup Condition=" '$(ANDROID_INCLUDE_ARM_SDK)' != '' ">
52-
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_sdk_armv7" />
51+
<ItemGroup Condition=" '$(INCLUDE_WINDOWS_ARM64_SDK)' != '' ">
52+
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="windows_arm64_sdk" />
5353
</ItemGroup>
5454

55-
<ItemGroup Condition=" '$(ANDROID_INCLUDE_X86_SDK)' != '' ">
56-
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_sdk_i686" />
55+
<ItemGroup Condition=" '$(INCLUDE_WINDOWS_X86_SDK)' != '' ">
56+
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="windows_x86_sdk" />
5757
</ItemGroup>
5858
</Project>

‎platforms/Windows/bundle/installer.wxs

Lines changed: 50 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,28 @@
2727
-->
2828
<Variable Name="InstallRoot" bal:Overridable="yes" Type="formatted" Persisted="yes"
2929
Value="[LocalAppDataFolder]Programs\Swift" />
30-
<Variable Name="OptionsInstallBld" Value="1" />
31-
<Variable Name="OptionsInstallCli" bal:Overridable="yes" Persisted="yes" Value="1" />
32-
<Variable Name="OptionsInstallDbg" bal:Overridable="yes" Persisted="yes" Value="1" />
33-
<Variable Name="OptionsInstallIde" bal:Overridable="yes" Persisted="yes" Value="1" />
34-
<Variable Name="OptionsInstallRtl" Value="1" />
35-
<Variable Name="OptionsInstallUtl" bal:Overridable="yes" Persisted="yes" Value="1" />
36-
<Variable Name="OptionsInstallSdkX86" bal:Overridable="yes" Persisted="yes" Value="1" />
37-
<Variable Name="OptionsInstallRedistX86" bal:Overridable="yes" Persisted="yes" Value="1" />
38-
<Variable Name="OptionsInstallSdkAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
39-
<Variable Name="OptionsInstallRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
40-
<Variable Name="OptionsInstallSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
41-
<Variable Name="OptionsInstallRedistArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
42-
<Variable Name="OptionsInstallAndroidSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
43-
<Variable Name="OptionsInstallAndroidSdkAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
44-
<Variable Name="OptionsInstallAndroidSdkArm" bal:Overridable="yes" Persisted="yes" Value="0" />
45-
<Variable Name="OptionsInstallAndroidSdkX86" bal:Overridable="yes" Persisted="yes" Value="0" />
30+
31+
<Variable Name="OptionsInstallBLD" Value="1" />
32+
<Variable Name="OptionsInstallCLI" bal:Overridable="yes" Persisted="yes" Value="1" />
33+
<Variable Name="OptionsInstallDBG" bal:Overridable="yes" Persisted="yes" Value="1" />
34+
<Variable Name="OptionsInstallIDE" bal:Overridable="yes" Persisted="yes" Value="1" />
35+
<Variable Name="OptionsInstallRTL" Value="1" />
36+
37+
<Variable Name="OptionsInstallUtilities" bal:Overridable="yes" Persisted="yes" Value="1" />
38+
39+
<Variable Name="OptionsInstallWindowsSDKX86" bal:Overridable="yes" Persisted="yes" Value="1" />
40+
<Variable Name="OptionsInstallWindowsRedistX86" bal:Overridable="yes" Persisted="yes" Value="1" />
41+
42+
<Variable Name="OptionsInstallWindowsSDKAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
43+
<Variable Name="OptionsInstallWindowsRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
44+
45+
<Variable Name="OptionsInstallWindowsSDKARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
46+
<Variable Name="OptionsInstallWindowsRedistARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
47+
48+
<Variable Name="OptionsInstallAndroidSDKARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
49+
<Variable Name="OptionsInstallAndroidSDKAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
50+
<Variable Name="OptionsInstallAndroidSDKARM" bal:Overridable="yes" Persisted="yes" Value="0" />
51+
<Variable Name="OptionsInstallAndroidSDKX86" bal:Overridable="yes" Persisted="yes" Value="0" />
4652

4753
<!--
4854
For the online bundle, we need to provide a download URL for each package and its .cabs.
@@ -68,7 +74,7 @@
6874
SourceFile="!(bindpath.rtl)\rtl.msi"
6975
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
7076
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
71-
<MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtl]" />
77+
<MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtilities]" />
7278
</MsiPackage>
7379

7480
<MsiPackage
@@ -79,88 +85,88 @@
7985

8086
<MsiPackage
8187
SourceFile="!(bindpath.cli)\cli.msi"
82-
InstallCondition="OptionsInstallCli = 1"
88+
InstallCondition="OptionsInstallCLI = 1"
8389
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
8490
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
8591
</MsiPackage>
8692

8793
<MsiPackage
8894
SourceFile="!(bindpath.dbg)\dbg.msi"
89-
InstallCondition="OptionsInstallDbg = 1"
95+
InstallCondition="OptionsInstallDBG = 1"
9096
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
9197
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
9298
</MsiPackage>
9399

94100
<MsiPackage
95101
SourceFile="!(bindpath.ide)\ide.msi"
96-
InstallCondition="OptionsInstallIde = 1"
102+
InstallCondition="OptionsInstallIDE = 1"
97103
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
98104
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
99105
</MsiPackage>
100106

101-
<?if $(INCLUDE_AMD64_SDK) == true ?>
107+
<?if $(INCLUDE_ANDROID_ARM_SDK) == true ?>
102108
<MsiPackage
103-
SourceFile="!(bindpath.sdk_amd64)\sdk.amd64.msi"
104-
InstallCondition="OptionsInstallSdkAMD64 = 1"
109+
SourceFile="!(bindpath.android_armv7_sdk)\sdk.android.armv7.msi"
110+
InstallCondition="OptionsInstallAndroidSDKARM = 1"
105111
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
106112
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
107-
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistAMD64]" />
108113
</MsiPackage>
109114
<?endif?>
110115

111-
<?if $(INCLUDE_ARM64_SDK) == true ?>
116+
<?if $(INCLUDE_ANDROID_ARM64_SDK) == true ?>
112117
<MsiPackage
113-
SourceFile="!(bindpath.sdk_arm64)\sdk.arm64.msi"
114-
InstallCondition="OptionsInstallSdkArm64 = 1"
118+
SourceFile="!(bindpath.android_aarch64_sdk)\sdk.android.aarch64.msi"
119+
InstallCondition="OptionsInstallAndroidSDKARM64 = 1"
115120
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
116121
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
117-
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistArm64]" />
118122
</MsiPackage>
119123
<?endif?>
120124

121-
<?if $(INCLUDE_X86_SDK) == true?>
125+
<?if $(INCLUDE_ANDROID_X86_SDK) == true ?>
122126
<MsiPackage
123-
SourceFile="!(bindpath.sdk_x86)\sdk.x86.msi"
124-
InstallCondition="OptionsInstallSdkX86 = 1"
127+
SourceFile="!(bindpath.android_i686_sdk)\sdk.android.i686.msi"
128+
InstallCondition="OptionsInstallAndroidSDKX86 = 1"
125129
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
126130
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
127-
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistx86]" />
128131
</MsiPackage>
129132
<?endif?>
130133

131-
<?if $(ANDROID_INCLUDE_ARM64_SDK) == true ?>
134+
<?if $(INCLUDE_ANDROID_X86_64_SDK) == true ?>
132135
<MsiPackage
133-
SourceFile="!(bindpath.android_sdk_aarch64)\android_sdk.aarch64.msi"
134-
InstallCondition="OptionsInstallAndroidSdkArm64 = 1"
136+
SourceFile="!(bindpath.android_x86_64_sdk)\sdk.android.x86_64.msi"
137+
InstallCondition="OptionsInstallAndroidSDKAMD64 = 1"
135138
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
136139
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
137140
</MsiPackage>
138141
<?endif?>
139142

140-
<?if $(ANDROID_INCLUDE_x86_64_SDK) == true ?>
143+
<?if $(INCLUDE_WINDOWS_AMD64_SDK) == true ?>
141144
<MsiPackage
142-
SourceFile="!(bindpath.android_sdk_x86_64)\android_sdk.x86_64.msi"
143-
InstallCondition="OptionsInstallAndroidSdkAMD64 = 1"
145+
SourceFile="!(bindpath.windows_amd64_sdk)\sdk.windows.amd64.msi"
146+
InstallCondition="OptionsInstallWindowsSDKAMD64 = 1"
144147
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
145148
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
149+
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
146150
</MsiPackage>
147151
<?endif?>
148152

149-
<?if $(ANDROID_INCLUDE_ARM_SDK) == true ?>
153+
<?if $(INCLUDE_WINDOWS_ARM64_SDK) == true ?>
150154
<MsiPackage
151-
SourceFile="!(bindpath.android_sdk_armv7)\android_sdk.armv7.msi"
152-
InstallCondition="OptionsInstallAndroidSdkArm = 1"
155+
SourceFile="!(bindpath.windows_arm64_sdk)\sdk.windows.arm64.msi"
156+
InstallCondition="OptionsInstallWindowsSDKARM64 = 1"
153157
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
154158
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
159+
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistARM64]" />
155160
</MsiPackage>
156161
<?endif?>
157162

158-
<?if $(ANDROID_INCLUDE_X86_SDK) == true ?>
163+
<?if $(INCLUDE_WINDOWS_X86_SDK) == true?>
159164
<MsiPackage
160-
SourceFile="!(bindpath.android_sdk_i686)\android_sdk.i686.msi"
161-
InstallCondition="OptionsInstallAndroidSdkX86 = 1"
165+
SourceFile="!(bindpath.windows_x86_sdk)\sdk.windows.x86.msi"
166+
InstallCondition="OptionsInstallWindowsSDKX86 = 1"
162167
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
163168
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
169+
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistX86]" />
164170
</MsiPackage>
165171
<?endif?>
166172
</Chain>

‎platforms/Windows/readme.md

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,20 @@ The bundle authoring (in `installer.wxs`) drives optional install directory and
3232
| Variable | Description |
3333
| -------- | ----------- |
3434
| InstallRoot | A formatted string variable that specifies the installation root directory. The default value specified in `installer.wxs` should match the equivalent `INSTALLROOT` authoring in `shared.wxs`. The bundle variable is passed to each `MsiPackage` so overwrites the default directory authored in the MSI packages -- but keeping them in sync avoids the confusion if the default directory should change. |
35-
| OptionsInstallBld | Controls whether bld.msi will be installed. |
36-
| OptionsInstallCli | Controls whether cli.msi will be installed. |
37-
| OptionsInstallDbg | Controls whether dbg.msi will be installed. |
38-
| OptionsInstallIde | Controls whether ide.msi will be installed. |
39-
| OptionsInstallRtl | Controls whether rtl.msi will be installed. |
40-
| OptionsInstallSdkX86 | Controls whether the x86 SDK will be installed. |
41-
| OptionsInstallSdkAMD64 | Controls whether the AMD64 SDK will be installed. |
42-
| OptionsInstallSdkArm64 | Controls whether the Arm64 SDK will be installed. |
35+
| OptionsInstallCLI | Controls whether command-line tools will be installed. |
36+
| OptionsInstallDBG | Controls whether debugging tools will be installed. |
37+
| OptionsInstallIDE | Controls whether IDE integration tools will be installed. |
38+
| OptionsInstallUtilties | Controls whether additional utilities will be installed. |
39+
| OptionsInstallAndroidSDKAMD64 | Controls whether the Android AMD64 SDK will be installed. |
40+
| OptionsInstallAndroidSDKARM | Controls whether the Android ARM SDK will be installed. |
41+
| OptionsInstallAndroidSDKARM64 | Controls whether the Android ARM64 SDK will be installed. |
42+
| OptionsInstallAndroidSDKX86 | Controls whether the Android X86 SDK will be installed. |
43+
| OptionsInstallWindowsSDKX86 | Controls whether the Windows X86 SDK will be installed. |
44+
| OptionsInstallWindowsRedistAMD64 | Controls whether the Windows AMD64 Redistributable MSM will be installed. |
45+
| OptionsInstallWindowsSDKAMD64 | Controls whether the Windows AMD64 SDK will be installed. |
46+
| OptionsInstallWindowsRedistARM64 | Controls whether the Windows ARM64 Redistributable MSM will be installed. |
47+
| OptionsInstallWindowsSDKX86 | Controls whether the Windows X86 SDK will be installed. |
48+
| OptionsInstallWindowsRedistX86 | Controls whether the Windows X86 Redistributable MSM will be installed. |
4349

4450
Those variables are tied to controls in the bundle theme (`installer\theme.xml`) on the Options page. For example, the install directory is an `Editbox` control that takes the `InstallRoot` name to tie itself to the `InstallRoot` variable in `installer.wxs`:
4551

@@ -50,7 +56,7 @@ Those variables are tied to controls in the bundle theme (`installer\theme.xml`)
5056
Likewise, the feature selection controls are all checkboxes tied to the variables that control feature selection:
5157

5258
```xml
53-
<Checkbox Name="OptionsInstallIde" X="185" Y="170" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsInstallIde)</Checkbox>
59+
<Checkbox Name="OptionsInstallIDE" X="185" Y="170" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.OptionsInstallIDE)</Checkbox>
5460
```
5561

5662
`Checkbox` controls set variables to `1` when checked and `0` when unchecked.
@@ -60,7 +66,7 @@ The variables are used in `installer.wxs` bundle authoring to control the instal
6066
```xml
6167
<MsiPackage
6268
SourceFile="!(bindpath.ide)\ide.msi"
63-
InstallCondition="OptionsInstallIde = 1"
69+
InstallCondition="OptionsInstallIDE = 1"
6470
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
6571
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
6672
</MsiPackage>
@@ -81,7 +87,7 @@ The same variables that drive install directory and feature selection are availa
8187

8288

8389
```sh
84-
installer.exe /passive InstallRoot=X:\Swift OptionsInstallIde=0 OptionsInstallSdkX86=0 OptionsInstallSdkArm64=0
90+
installer.exe /passive InstallRoot=X:\Swift OptionsInstallIDE=0 OptionsInstallWindowsSDKX86=0 OptionsInstallWindowsSDKARM64=0
8591
```
8692

8793
To create a layout from a online bundle to allow for offline install:
@@ -107,7 +113,7 @@ MSBuild automatically imports Directory.Build.props files in your tree. We use D
107113
| BundleFlavor, IsBundleCompressed | BundleFlavor defaults to `online` to build an online bundle. Set by the invocation of MSBuild to build an online or offline bundle. Controls IsBundleCompressed. |
108114
| DefineConstants | Passes a subset of MSBuild properties into the WiX build as preprocessor variables. |
109115
| INCLUDE_SWIFT_DOCC | swift-docc is currently conditionalized out. Set it to `true` to include it. The property `SWIFT_DOCC_BUILD` defines the directory to find the artifacts. |
110-
| INCLUDE_X86_SDK, INCLUDE_ARM64_SDK | The x86 and Arm64 SDKs are currently conditionalized out, pending build changes. Set these to `true` to include them in the bundles. Note that bundle\theme.xml currently has commented-out checkboxes that need to be restored when the x86 and Arm64 SDKs are brought back. |
116+
| INCLUDE_ANDROID_ARM_SDK, INCLUDE_ANDROID_ARM64_SDK, INCLUDE_ANDROID_X86_SDK, INCLUDE_ANDROID_x86_64_SDK, INCLUDE_WINDOWS_AMD64_SDK, INCLUDE_WINDOWS_ARM64_SDK, INCLUDE_WINDOWS_X86_SDK | The included SDKs are currently conditionalized out. Set these to `true` to include them in the bundles. |
111117

112118

113119
## SDKs

‎platforms/Windows/sdk/sdk.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="WixToolset.Sdk/4.0.5">
22
<PropertyGroup>
3-
<OutputName>sdk.$(ProductArchitecture)</OutputName>
3+
<OutputName>sdk.windows.$(ProductArchitecture)</OutputName>
44
<Platform>x86</Platform>
55

66
<SwiftShimsPath>$(SDK_ROOT)\usr\lib\swift\shims</SwiftShimsPath>

‎platforms/Windows/sdk/sdk.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
Version="$(NonSemVerProductVersion)"
2424
Scope="$(PackageScope)">
2525

26-
<Media Id="1" Cabinet="sdk.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
26+
<Media Id="1" Cabinet="sdk.windows.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
2727

2828
<WixVariable Id="SideBySidePackageUpgradeCode" Value="$(WindowsSDKUpgradeCode)" />
2929
<FeatureGroupRef Id="SideBySideUpgradeStrategy" />

0 commit comments

Comments
 (0)