Skip to content

Commit 7e6607f

Browse files
bnbarhambnbarham
committed
[6.1] Merge main into 6.1 to pick up recent fixes
We mostly want 345b660, but the rest all seem reasonable as well.
2 parents 3878d65 + 6cecc7c commit 7e6607f

17 files changed

+173
-185
lines changed

‎platforms/Windows/bld/bld.wixproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<PropertyGroup>
33
<DefineConstants>
44
$(DefineConstants);
5-
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
65
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
76
TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
87
TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;

‎platforms/Windows/bld/bld.wxs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -352,40 +352,40 @@
352352

353353
<ComponentGroup Id="argument_parser" Directory="_usr_bin">
354354
<Component>
355-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
355+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\ArgumentParser.dll" />
356356
</Component>
357357
</ComponentGroup>
358358

359359
<ComponentGroup Id="tools_support_core" Directory="_usr_bin">
360360
<Component>
361-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" />
361+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCBasic.dll" />
362362
</Component>
363363
<Component>
364-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" />
364+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCUtility.dll" />
365365
</Component>
366366
</ComponentGroup>
367367

368368
<ComponentGroup Id="swift_driver" Directory="_usr_bin">
369369
<!-- TODO(compnerd) can we use symbolic links to swift.exe instead? -->
370370
<Component>
371-
<File Name="swiftc.exe" Source="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
371+
<File Name="swiftc.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
372372
</Component>
373373

374374
<Component>
375-
<File Name="swift.exe" Source="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
375+
<File Name="swift.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
376376
</Component>
377377
<Component>
378-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-help.exe" />
378+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-help.exe" />
379379
</Component>
380380

381381
<Component>
382-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" />
382+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftOptions.dll" />
383383
</Component>
384384
<Component>
385-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" />
385+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriver.dll" />
386386
</Component>
387387
<Component>
388-
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriverExecution.dll" />
388+
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriverExecution.dll" />
389389
</Component>
390390
</ComponentGroup>
391391

‎platforms/Windows/bundle/installer.wixproj

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +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_X86_SDK=$(INCLUDE_X86_SDK);
10-
INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
11-
ANDROID_INCLUDE_ARM64_SDK=$(ANDROID_INCLUDE_ARM64_SDK);
12-
ANDROID_INCLUDE_x86_64_SDK=$(ANDROID_INCLUDE_x86_64_SDK);
13-
ANDROID_INCLUDE_ARM_SDK=$(ANDROID_INCLUDE_ARM_SDK);
14-
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);
1516
</DefineConstants>
1617
</PropertyGroup>
1718

@@ -25,30 +26,33 @@
2526
<ProjectReference Include="..\dbg\dbg.wixproj" BindName="dbg" />
2627
<ProjectReference Include="..\ide\ide.wixproj" BindName="ide" />
2728
<ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
28-
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="sdk_amd64" />
2929
</ItemGroup>
3030

31-
<ItemGroup Condition=" '$(INCLUDE_X86_SDK)' != '' ">
32-
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="sdk_x86" />
31+
<ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM_SDK)' != '' ">
32+
<ProjectReference Include="..\sdk\drd\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="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_aarch64_sdk" />
3737
</ItemGroup>
3838

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

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

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

51-
<ItemGroup Condition=" '$(ANDROID_INCLUDE_X86_SDK)' != '' ">
52-
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_sdk_i686" />
51+
<ItemGroup Condition=" '$(INCLUDE_WINDOWS_ARM64_SDK)' != '' ">
52+
<ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="windows_arm64_sdk" />
53+
</ItemGroup>
54+
55+
<ItemGroup Condition=" '$(INCLUDE_WINDOWS_X86_SDK)' != '' ">
56+
<ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="windows_x86_sdk" />
5357
</ItemGroup>
5458
</Project>

‎platforms/Windows/bundle/installer.wxs

Lines changed: 55 additions & 47 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,86 +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_X86_SDK) == true?>
107+
<?if $(INCLUDE_ANDROID_ARM_SDK) == true ?>
102108
<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"
105111
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
106112
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
107-
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistX86]" />
108113
</MsiPackage>
109114
<?endif?>
110115

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?>
118124

119-
<?if $(INCLUDE_ARM64_SDK) == true ?>
125+
<?if $(INCLUDE_ANDROID_X86_SDK) == true ?>
120126
<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"
123129
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
124130
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
125-
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistArm64]" />
126131
</MsiPackage>
127132
<?endif?>
128133

129-
<?if $(ANDROID_INCLUDE_ARM64_SDK) == true ?>
134+
<?if $(INCLUDE_ANDROID_X86_64_SDK) == true ?>
130135
<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"
133138
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
134139
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
135140
</MsiPackage>
136141
<?endif?>
137142

138-
<?if $(ANDROID_INCLUDE_x86_64_SDK) == true ?>
143+
<?if $(INCLUDE_WINDOWS_AMD64_SDK) == true ?>
139144
<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"
142147
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
143148
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
149+
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
144150
</MsiPackage>
145151
<?endif?>
146152

147-
<?if $(ANDROID_INCLUDE_ARM_SDK) == true ?>
153+
<?if $(INCLUDE_WINDOWS_ARM64_SDK) == true ?>
148154
<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"
151157
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
152158
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
159+
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistARM64]" />
153160
</MsiPackage>
154161
<?endif?>
155162

156-
<?if $(ANDROID_INCLUDE_X86_SDK) == true ?>
163+
<?if $(INCLUDE_WINDOWS_X86_SDK) == true?>
157164
<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"
160167
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
161168
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
169+
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistX86]" />
162170
</MsiPackage>
163171
<?endif?>
164172
</Chain>

0 commit comments

Comments
 (0)