Skip to content

Commit 3c0215e

Browse files
hyphyp
committed
Add all android arches to the toolchain installer bundle
1 parent 4880823 commit 3c0215e

File tree

4 files changed

+60
-9
lines changed

4 files changed

+60
-9
lines changed

‎platforms/Windows/bundle/installer.wixproj‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
$(DefineConstants);
99
INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
1010
INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
11-
INCLUDE_ANDROID_SDKS=$(INCLUDE_ANDROID_SDKS);
11+
INCLUDE_ARM64_ANDROID_SDK=$(INCLUDE_ARM64_ANDROID_SDK);
12+
INCLUDE_x86_64_ANDROID_SDK=$(INCLUDE_x86_64_ANDROID_SDK);
13+
INCLUDE_ARM_ANDROID_SDK=$(INCLUDE_ARM_ANDROID_SDK);
14+
INCLUDE_X86_ANDROID_SDK=$(INCLUDE_X86_ANDROID_SDK);
1215
</DefineConstants>
1316
</PropertyGroup>
1417

@@ -33,7 +36,19 @@
3336
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="sdk_arm64" />
3437
</ItemGroup>
3538

36-
<ItemGroup Condition=" '$(INCLUDE_ANDROID_SDKS)' != '' ">
39+
<ItemGroup Condition=" '$(INCLUDE_ARM64_ANDROID_SDK)' != '' ">
3740
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_sdk_aarch64" />
3841
</ItemGroup>
42+
43+
<ItemGroup Condition=" '$(INCLUDE_x86_64_ANDROID_SDK)' != '' ">
44+
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=x86_64;Platform=x86" BindName="android_sdk_x86_64" />
45+
</ItemGroup>
46+
47+
<ItemGroup Condition=" '$(INCLUDE_ARM_ANDROID_SDK)' != '' ">
48+
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_sdk_armv7" />
49+
</ItemGroup>
50+
51+
<ItemGroup Condition=" '$(INCLUDE_X86_ANDROID_SDK)' != '' ">
52+
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_sdk_i686" />
53+
</ItemGroup>
3954
</Project>

‎platforms/Windows/bundle/installer.wxs‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@
3838
<Variable Name="OptionsInstallRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
3939
<Variable Name="OptionsInstallSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
4040
<Variable Name="OptionsInstallRedistArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
41-
<Variable Name="OptionsInstallAndroidSdks" bal:Overridable="yes" Persisted="yes" Value="1" />
41+
<Variable Name="OptionsInstallAndroidSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
42+
<Variable Name="OptionsInstallAndroidSdkAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
43+
<Variable Name="OptionsInstallAndroidSdkArm" bal:Overridable="yes" Persisted="yes" Value="1" />
44+
<Variable Name="OptionsInstallAndroidSdkX86" bal:Overridable="yes" Persisted="yes" Value="1" />
4245

4346
<!--
4447
For the online bundle, we need to provide a download URL for each package and its .cabs.
@@ -121,10 +124,37 @@
121124
</MsiPackage>
122125
<?endif?>
123126

124-
<?if $(INCLUDE_ANDROID_SDKS) == true ?>
127+
<?if $(INCLUDE_ARM64_ANDROID_SDK) == true ?>
125128
<MsiPackage
126129
SourceFile="!(bindpath.android_sdk_aarch64)\android_sdk.aarch64.msi"
127-
InstallCondition="OptionsInstallAndroidSdks"
130+
InstallCondition="OptionsInstallAndroidSdkArm64"
131+
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
132+
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
133+
</MsiPackage>
134+
<?endif?>
135+
136+
<?if $(INCLUDE_x86_64_ANDROID_SDK) == true ?>
137+
<MsiPackage
138+
SourceFile="!(bindpath.android_sdk_x86_64)\android_sdk.x86_64.msi"
139+
InstallCondition="OptionsInstallAndroidSdkAMD64"
140+
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
141+
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
142+
</MsiPackage>
143+
<?endif?>
144+
145+
<?if $(INCLUDE_ARM_ANDROID_SDK) == true ?>
146+
<MsiPackage
147+
SourceFile="!(bindpath.android_sdk_armv7)\android_sdk.armv7.msi"
148+
InstallCondition="OptionsInstallAndroidSdkArm"
149+
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
150+
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
151+
</MsiPackage>
152+
<?endif?>
153+
154+
<?if $(INCLUDE_X86_ANDROID_SDK) == true ?>
155+
<MsiPackage
156+
SourceFile="!(bindpath.android_sdk_i686)\android_sdk.i686.msi"
157+
InstallCondition="OptionsInstallAndroidSdkX86"
128158
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
129159
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
130160
</MsiPackage>

‎platforms/Windows/bundle/theme.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Font Id="2" Height="-22" Weight="500" Foreground="graytext">Segoe UI</Font>
1010
<Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
1111

12-
<Window Width="614" Height="384" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
12+
<Window Width="614" Height="456" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
1313
<ImageControl X="0" Y="0" Width="165" Height="384" ImageFile="swift_side.png"/>
1414
<Label X="176" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
1515

@@ -67,7 +67,10 @@
6767
<Checkbox Name="OptionsInstallRedistArm64" X="194" Y="285" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkArm64">#(loc.Redist_arm64)</Checkbox>
6868
<Checkbox Name="OptionsInstallSdkX86" X="176" Y="303" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_x86)</Checkbox>
6969
<Checkbox Name="OptionsInstallRedistX86" X="194" Y="321" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSdkX86">#(loc.Redist_x86)</Checkbox>
70-
<Checkbox Name="OptionsInstallAndroidSDKs" X="176" Y="338" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidSdks">#(loc.Android_Skds)</Checkbox>
70+
<Checkbox Name="OptionsInstallAndroidSdkArm64" X="176" Y="339" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_arm64)</Checkbox>
71+
<Checkbox Name="OptionsInstallAndroidSdkAMD64" X="176" Y="357" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_amd64)</Checkbox>
72+
<Checkbox Name="OptionsInstallAndroidSdkArm" X="176" Y="375" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_arm)</Checkbox>
73+
<Checkbox Name="OptionsInstallAndroidSdkX86" X="176" Y="393" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_x86)</Checkbox>
7174

7275
<Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
7376
<Text>#(loc.OptionsOkButton)</Text>

‎platforms/Windows/shared/swift.en-us.wxl‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<String Id="Sdk_ProductName_x86" Value="Swift Windows SDK (X86)" />
1919
<String Id="AndroidSdk_ProductName_aarch64" Value="Swift Android SDK (Arm64)" />
2020
<String Id="AndroidSdk_ProductName_x86_64" Value="Swift Android SDK (AMD64)" />
21-
<String Id="AndroidSdk_ProductName_armv7" Value="Swift Android SDK (Arm)" />
21+
<String Id="AndroidSdk_ProductName_armv7" Value="Swift Android SDK (ARM)" />
2222
<String Id="AndroidSdk_ProductName_i686" Value="Swift Android SDK (X86)" />
2323
<String Id="BundleName" Value="Swift Developer Toolkit" />
2424
<String Id="ManufacturerName" Value="swift.org" />
@@ -27,7 +27,10 @@
2727
<String Id="Redist_arm64" Value="Swift Windows Redistributable (ARM64)" />
2828
<String Id="Redist_amd64" Value="Swift Windows Redistributable (AMD64)" />
2929
<String Id="Redist_x86" Value="Swift Windows Redistributable (X86)" />
30-
<String Id="Android_Skds" Value="Swift Android SDKs" />
30+
<String Id="Android_Sdk_arm64" Value="Swift Android SDK (ARM64)" />
31+
<String Id="Android_Sdk_amd64" Value="Swift Android SDK (AMD64)" />
32+
<String Id="Android_Sdk_arm" Value="Swift Android SDK (ARM)" />
33+
<String Id="Android_Sdk_x86" Value="Swift Android SDK (X86)" />
3134

3235
<String Id="Caption" Value="[WixBundleName] Setup" />
3336
<String Id="Title" Value="[WixBundleName]" />

0 commit comments

Comments
 (0)