|
27 | 27 | -->
|
28 | 28 | <Variable Name="InstallRoot" bal:Overridable="yes" Type="formatted" Persisted="yes"
|
29 | 29 | 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" /> |
46 | 52 |
|
47 | 53 | <!--
|
48 | 54 | For the online bundle, we need to provide a download URL for each package and its .cabs.
|
|
68 | 74 | SourceFile="!(bindpath.rtl)\rtl.msi"
|
69 | 75 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
70 | 76 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
71 |
| - <MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtl]" /> |
| 77 | + <MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtilities]" /> |
72 | 78 | </MsiPackage>
|
73 | 79 |
|
74 | 80 | <MsiPackage
|
|
79 | 85 |
|
80 | 86 | <MsiPackage
|
81 | 87 | SourceFile="!(bindpath.cli)\cli.msi"
|
82 |
| - InstallCondition="OptionsInstallCli = 1" |
| 88 | + InstallCondition="OptionsInstallCLI = 1" |
83 | 89 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
84 | 90 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
85 | 91 | </MsiPackage>
|
86 | 92 |
|
87 | 93 | <MsiPackage
|
88 | 94 | SourceFile="!(bindpath.dbg)\dbg.msi"
|
89 |
| - InstallCondition="OptionsInstallDbg = 1" |
| 95 | + InstallCondition="OptionsInstallDBG = 1" |
90 | 96 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
91 | 97 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
92 | 98 | </MsiPackage>
|
93 | 99 |
|
94 | 100 | <MsiPackage
|
95 | 101 | SourceFile="!(bindpath.ide)\ide.msi"
|
96 |
| - InstallCondition="OptionsInstallIde = 1" |
| 102 | + InstallCondition="OptionsInstallIDE = 1" |
97 | 103 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
98 | 104 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
99 | 105 | </MsiPackage>
|
100 | 106 |
|
101 |
| - <?if $(INCLUDE_X86_SDK) == true?> |
| 107 | + <?if $(INCLUDE_ANDROID_ARM_SDK) == true ?> |
102 | 108 | <MsiPackage
|
103 |
| - SourceFile="!(bindpath.sdk_x86)\sdk.x86.msi" |
104 |
| - InstallCondition="OptionsInstallSdkX86 = 1" |
| 109 | + SourceFile="!(bindpath.android_armv7_sdk)\sdk.android.armv7.msi" |
| 110 | + InstallCondition="OptionsInstallAndroidSDKARM = 1" |
105 | 111 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
106 | 112 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
107 |
| - <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistX86]" /> |
108 | 113 | </MsiPackage>
|
109 | 114 | <?endif?>
|
110 | 115 |
|
111 |
| - <MsiPackage |
112 |
| - SourceFile="!(bindpath.sdk_amd64)\sdk.amd64.msi" |
113 |
| - InstallCondition="OptionsInstallSdkAMD64 = 1" |
114 |
| - DownloadUrl="$(BaseReleaseDownloadUrl)/{2}"> |
115 |
| - <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" /> |
116 |
| - <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistAMD64]" /> |
117 |
| - </MsiPackage> |
| 116 | + <?if $(INCLUDE_ANDROID_ARM64_SDK) == true ?> |
| 117 | + <MsiPackage |
| 118 | + SourceFile="!(bindpath.android_aarch64_sdk)\sdk.android.aarch64.msi" |
| 119 | + InstallCondition="OptionsInstallAndroidSDKARM64 = 1" |
| 120 | + DownloadUrl="$(BaseReleaseDownloadUrl)/{2}"> |
| 121 | + <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" /> |
| 122 | + </MsiPackage> |
| 123 | + <?endif?> |
118 | 124 |
|
119 |
| - <?if $(INCLUDE_ARM64_SDK) == true ?> |
| 125 | + <?if $(INCLUDE_ANDROID_X86_SDK) == true ?> |
120 | 126 | <MsiPackage
|
121 |
| - SourceFile="!(bindpath.sdk_arm64)\sdk.arm64.msi" |
122 |
| - InstallCondition="OptionsInstallSdkArm64 = 1" |
| 127 | + SourceFile="!(bindpath.android_i686_sdk)\sdk.android.i686.msi" |
| 128 | + InstallCondition="OptionsInstallAndroidSDKX86 = 1" |
123 | 129 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
124 | 130 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
125 |
| - <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistArm64]" /> |
126 | 131 | </MsiPackage>
|
127 | 132 | <?endif?>
|
128 | 133 |
|
129 |
| - <?if $(ANDROID_INCLUDE_ARM64_SDK) == true ?> |
| 134 | + <?if $(INCLUDE_ANDROID_X86_64_SDK) == true ?> |
130 | 135 | <MsiPackage
|
131 |
| - SourceFile="!(bindpath.android_sdk_aarch64)\android_sdk.aarch64.msi" |
132 |
| - InstallCondition="OptionsInstallAndroidSdkArm64 = 1" |
| 136 | + SourceFile="!(bindpath.android_x86_64_sdk)\sdk.android.x86_64.msi" |
| 137 | + InstallCondition="OptionsInstallAndroidSDKAMD64 = 1" |
133 | 138 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
134 | 139 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
135 | 140 | </MsiPackage>
|
136 | 141 | <?endif?>
|
137 | 142 |
|
138 |
| - <?if $(ANDROID_INCLUDE_x86_64_SDK) == true ?> |
| 143 | + <?if $(INCLUDE_WINDOWS_AMD64_SDK) == true ?> |
139 | 144 | <MsiPackage
|
140 |
| - SourceFile="!(bindpath.android_sdk_x86_64)\android_sdk.x86_64.msi" |
141 |
| - InstallCondition="OptionsInstallAndroidSdkAMD64 = 1" |
| 145 | + SourceFile="!(bindpath.windows_amd64_sdk)\sdk.windows.amd64.msi" |
| 146 | + InstallCondition="OptionsInstallWindowsSDKAMD64 = 1" |
142 | 147 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
143 | 148 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
| 149 | + <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistAMD64]" /> |
144 | 150 | </MsiPackage>
|
145 | 151 | <?endif?>
|
146 | 152 |
|
147 |
| - <?if $(ANDROID_INCLUDE_ARM_SDK) == true ?> |
| 153 | + <?if $(INCLUDE_WINDOWS_ARM64_SDK) == true ?> |
148 | 154 | <MsiPackage
|
149 |
| - SourceFile="!(bindpath.android_sdk_armv7)\android_sdk.armv7.msi" |
150 |
| - InstallCondition="OptionsInstallAndroidSdkArm = 1" |
| 155 | + SourceFile="!(bindpath.windows_arm64_sdk)\sdk.windows.arm64.msi" |
| 156 | + InstallCondition="OptionsInstallWindowsSDKARM64 = 1" |
151 | 157 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
152 | 158 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
| 159 | + <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistARM64]" /> |
153 | 160 | </MsiPackage>
|
154 | 161 | <?endif?>
|
155 | 162 |
|
156 |
| - <?if $(ANDROID_INCLUDE_X86_SDK) == true ?> |
| 163 | + <?if $(INCLUDE_WINDOWS_X86_SDK) == true?> |
157 | 164 | <MsiPackage
|
158 |
| - SourceFile="!(bindpath.android_sdk_i686)\android_sdk.i686.msi" |
159 |
| - InstallCondition="OptionsInstallAndroidSdkX86 = 1" |
| 165 | + SourceFile="!(bindpath.windows_x86_sdk)\sdk.windows.x86.msi" |
| 166 | + InstallCondition="OptionsInstallWindowsSDKX86 = 1" |
160 | 167 | DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
|
161 | 168 | <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
|
| 169 | + <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistX86]" /> |
162 | 170 | </MsiPackage>
|
163 | 171 | <?endif?>
|
164 | 172 | </Chain>
|
|
0 commit comments