Skip to content

[6.1] Merge main into 6.1 to pick up recent fixes #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 13, 2025
Merged

[6.1] Merge main into 6.1 to pick up recent fixes #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e833a7f
WiX: handle all installed architectures similarly
compnerd Aug 29, 2023
aa45289
WiX: remove references to `DEVTOOLS_ROOT`
compnerd Nov 18, 2024
37a88af
WiX: update documentation to include DocC properties
compnerd Nov 19, 2024
4bd52af
dbg: make swift-inspect required for Windows
compnerd Nov 21, 2024
ba851ca
WiX: adjust SDK handling for homogeneity
compnerd Nov 19, 2024
662949b
Fix the Windows installer command line options
hjyamauchi Dec 16, 2024
c4a3e74
WiX: restructure SDK manifests
compnerd Nov 20, 2024
8db8df4
WiX: add missing reference to `shared.wixproj`
Steelskin Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion platforms/Windows/bld/bld.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<DefineConstants>
$(DefineConstants);
DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);
TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
Expand Down
18 changes: 9 additions & 9 deletions platforms/Windows/bld/bld.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,40 +352,40 @@

<ComponentGroup Id="argument_parser" Directory="_usr_bin">
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\ArgumentParser.dll" />
</Component>
</ComponentGroup>

<ComponentGroup Id="tools_support_core" Directory="_usr_bin">
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCBasic.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCUtility.dll" />
</Component>
</ComponentGroup>

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

<Component>
<File Name="swift.exe" Source="$(DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" />
<File Name="swift.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\swift-help.exe" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-help.exe" />
</Component>

<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftOptions.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriver.dll" />
</Component>
<Component>
<File Source="$(DEVTOOLS_ROOT)\usr\bin\SwiftDriverExecution.dll" />
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriverExecution.dll" />
</Component>
</ComponentGroup>

Expand Down
42 changes: 23 additions & 19 deletions platforms/Windows/bundle/installer.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
<VCRedistDownloadUrl Condition=" '$(VCRedistDownloadUrl)' == '' AND '$(VSMajorVersion)' != '' ">https://aka.ms/vs/$(VSMajorVersion)/release/vc_redist.$(ProductArchitecture).exe</VCRedistDownloadUrl>
<DefineConstants>
$(DefineConstants);
INCLUDE_X86_SDK=$(INCLUDE_X86_SDK);
INCLUDE_ARM64_SDK=$(INCLUDE_ARM64_SDK);
ANDROID_INCLUDE_ARM64_SDK=$(ANDROID_INCLUDE_ARM64_SDK);
ANDROID_INCLUDE_x86_64_SDK=$(ANDROID_INCLUDE_x86_64_SDK);
ANDROID_INCLUDE_ARM_SDK=$(ANDROID_INCLUDE_ARM_SDK);
ANDROID_INCLUDE_X86_SDK=$(ANDROID_INCLUDE_X86_SDK);
INCLUDE_ANDROID_ARM_SDK=$(INCLUDE_ANDROID_ARM_SDK);
INCLUDE_ANDROID_ARM64_SDK=$(INCLUDE_ANDROID_ARM64_SDK);
INCLUDE_ANDROID_X86_SDK=$(INCLUDE_ANDROID_X86_SDK);
INCLUDE_ANDROID_X86_64_SDK=$(INCLUDE_ANDROID_X86_64_SDK);
INCLUDE_WINDOWS_AMD64_SDK=$(INCLUDE_WINDOWS_AMD64_SDK);
INCLUDE_WINDOWS_ARM64_SDK=$(INCLUDE_WINDOWS_ARM64_SDK);
INCLUDE_WINDOWS_X86_SDK=$(INCLUDE_WINDOWS_X86_SDK);
</DefineConstants>
</PropertyGroup>

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

<ItemGroup Condition=" '$(INCLUDE_X86_SDK)' != '' ">
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="sdk_x86" />
<ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM_SDK)' != '' ">
<ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_armv7_sdk" />
</ItemGroup>

<ItemGroup Condition=" '$(INCLUDE_ARM64_SDK)' != '' ">
<ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="sdk_arm64" />
<ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM64_SDK)' != '' ">
<ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_aarch64_sdk" />
</ItemGroup>

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

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

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

<ItemGroup Condition=" '$(ANDROID_INCLUDE_X86_SDK)' != '' ">
<ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_sdk_i686" />
<ItemGroup Condition=" '$(INCLUDE_WINDOWS_ARM64_SDK)' != '' ">
<ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="windows_arm64_sdk" />
</ItemGroup>

<ItemGroup Condition=" '$(INCLUDE_WINDOWS_X86_SDK)' != '' ">
<ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="windows_x86_sdk" />
</ItemGroup>
</Project>
102 changes: 55 additions & 47 deletions platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,28 @@
-->
<Variable Name="InstallRoot" bal:Overridable="yes" Type="formatted" Persisted="yes"
Value="[LocalAppDataFolder]Programs\Swift" />
<Variable Name="OptionsInstallBld" Value="1" />
<Variable Name="OptionsInstallCli" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallDbg" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallIde" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRtl" Value="1" />
<Variable Name="OptionsInstallUtl" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallSdkX86" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRedistX86" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallSdkAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRedistArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallAndroidSdkArm64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallAndroidSdkAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallAndroidSdkArm" bal:Overridable="yes" Persisted="yes" Value="0" />
<Variable Name="OptionsInstallAndroidSdkX86" bal:Overridable="yes" Persisted="yes" Value="0" />

<Variable Name="OptionsInstallBLD" Value="1" />
<Variable Name="OptionsInstallCLI" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallDBG" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallIDE" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRTL" Value="1" />

<Variable Name="OptionsInstallUtilities" bal:Overridable="yes" Persisted="yes" Value="1" />

<Variable Name="OptionsInstallWindowsSDKX86" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallWindowsRedistX86" bal:Overridable="yes" Persisted="yes" Value="1" />

<Variable Name="OptionsInstallWindowsSDKAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallWindowsRedistAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />

<Variable Name="OptionsInstallWindowsSDKARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallWindowsRedistARM64" bal:Overridable="yes" Persisted="yes" Value="1" />

<Variable Name="OptionsInstallAndroidSDKARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallAndroidSDKAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallAndroidSDKARM" bal:Overridable="yes" Persisted="yes" Value="0" />
<Variable Name="OptionsInstallAndroidSDKX86" bal:Overridable="yes" Persisted="yes" Value="0" />

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

<MsiPackage
Expand All @@ -79,86 +85,88 @@

<MsiPackage
SourceFile="!(bindpath.cli)\cli.msi"
InstallCondition="OptionsInstallCli = 1"
InstallCondition="OptionsInstallCLI = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
</MsiPackage>

<MsiPackage
SourceFile="!(bindpath.dbg)\dbg.msi"
InstallCondition="OptionsInstallDbg = 1"
InstallCondition="OptionsInstallDBG = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
</MsiPackage>

<MsiPackage
SourceFile="!(bindpath.ide)\ide.msi"
InstallCondition="OptionsInstallIde = 1"
InstallCondition="OptionsInstallIDE = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
</MsiPackage>

<?if $(INCLUDE_X86_SDK) == true?>
<?if $(INCLUDE_ANDROID_ARM_SDK) == true ?>
<MsiPackage
SourceFile="!(bindpath.sdk_x86)\sdk.x86.msi"
InstallCondition="OptionsInstallSdkX86 = 1"
SourceFile="!(bindpath.android_armv7_sdk)\sdk.android.armv7.msi"
InstallCondition="OptionsInstallAndroidSDKARM = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistX86]" />
</MsiPackage>
<?endif?>

<MsiPackage
SourceFile="!(bindpath.sdk_amd64)\sdk.amd64.msi"
InstallCondition="OptionsInstallSdkAMD64 = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistAMD64]" />
</MsiPackage>
<?if $(INCLUDE_ANDROID_ARM64_SDK) == true ?>
<MsiPackage
SourceFile="!(bindpath.android_aarch64_sdk)\sdk.android.aarch64.msi"
InstallCondition="OptionsInstallAndroidSDKARM64 = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
</MsiPackage>
<?endif?>

<?if $(INCLUDE_ARM64_SDK) == true ?>
<?if $(INCLUDE_ANDROID_X86_SDK) == true ?>
<MsiPackage
SourceFile="!(bindpath.sdk_arm64)\sdk.arm64.msi"
InstallCondition="OptionsInstallSdkArm64 = 1"
SourceFile="!(bindpath.android_i686_sdk)\sdk.android.i686.msi"
InstallCondition="OptionsInstallAndroidSDKX86 = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallRedistArm64]" />
</MsiPackage>
<?endif?>

<?if $(ANDROID_INCLUDE_ARM64_SDK) == true ?>
<?if $(INCLUDE_ANDROID_X86_64_SDK) == true ?>
<MsiPackage
SourceFile="!(bindpath.android_sdk_aarch64)\android_sdk.aarch64.msi"
InstallCondition="OptionsInstallAndroidSdkArm64 = 1"
SourceFile="!(bindpath.android_x86_64_sdk)\sdk.android.x86_64.msi"
InstallCondition="OptionsInstallAndroidSDKAMD64 = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
</MsiPackage>
<?endif?>

<?if $(ANDROID_INCLUDE_x86_64_SDK) == true ?>
<?if $(INCLUDE_WINDOWS_AMD64_SDK) == true ?>
<MsiPackage
SourceFile="!(bindpath.android_sdk_x86_64)\android_sdk.x86_64.msi"
InstallCondition="OptionsInstallAndroidSdkAMD64 = 1"
SourceFile="!(bindpath.windows_amd64_sdk)\sdk.windows.amd64.msi"
InstallCondition="OptionsInstallWindowsSDKAMD64 = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
</MsiPackage>
<?endif?>

<?if $(ANDROID_INCLUDE_ARM_SDK) == true ?>
<?if $(INCLUDE_WINDOWS_ARM64_SDK) == true ?>
<MsiPackage
SourceFile="!(bindpath.android_sdk_armv7)\android_sdk.armv7.msi"
InstallCondition="OptionsInstallAndroidSdkArm = 1"
SourceFile="!(bindpath.windows_arm64_sdk)\sdk.windows.arm64.msi"
InstallCondition="OptionsInstallWindowsSDKARM64 = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistARM64]" />
</MsiPackage>
<?endif?>

<?if $(ANDROID_INCLUDE_X86_SDK) == true ?>
<?if $(INCLUDE_WINDOWS_X86_SDK) == true?>
<MsiPackage
SourceFile="!(bindpath.android_sdk_i686)\android_sdk.i686.msi"
InstallCondition="OptionsInstallAndroidSdkX86 = 1"
SourceFile="!(bindpath.windows_x86_sdk)\sdk.windows.x86.msi"
InstallCondition="OptionsInstallWindowsSDKX86 = 1"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistX86]" />
</MsiPackage>
<?endif?>
</Chain>
Expand Down
Loading