[windows] add an option to install Embeddable Python 3.10.1 in the toolchain installer #447
+83
−22
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,8 @@ | |
| <Font Id="2" Height="-18" Weight="500" Foreground="graytext">Segoe UI</Font> | ||
| <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font> | ||
|
|
||
| <Window Width="630" Height="530" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)"> | ||
| <ImageControl X="0" Y="0" Width="181" Height="530" ImageFile="swift_side.png"/> | ||
| <Label X="192" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label> | ||
|
|
||
| <Page Name="Help"> | ||
|
|
@@ -59,24 +59,24 @@ | |
| <Checkbox Name="OptionsInstallBLD" X="192" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox> | ||
| <Checkbox Name="OptionsInstallCLI" X="192" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox> | ||
| <Checkbox Name="OptionsInstallDBG" X="192" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox> | ||
| <Checkbox Name="OptionsInstallEmbeddedPython" X="210" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallDBG">#(loc.EmbeddedPython_ProductName)</Checkbox> | ||
| <Checkbox Name="OptionsInstallIDE" X="192" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox> | ||
| <Checkbox Name="OptionsInstallRTL" X="192" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox> | ||
| <Checkbox Name="OptionsInstallWindowsPlatform" X="192" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox> | ||
| <Checkbox Name="OptionsInstallWindowsSDKAMD64" X="210" Y="237" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox> | ||
| <Checkbox Name="OptionsInstallWindowsRedistAMD64" X="228" Y="255" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKAMD64">#(loc.Redist_amd64)</Checkbox> | ||
| <Checkbox Name="OptionsInstallWindowsSDKARM64" X="210" Y="273" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_arm64)</Checkbox> | ||
| <Checkbox Name="OptionsInstallWindowsRedistARM64" X="228" Y="291" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKARM64">#(loc.Redist_arm64)</Checkbox> | ||
| <Checkbox Name="OptionsInstallWindowsSDKX86" X="210" Y="309" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_x86)</Checkbox> | ||
| <Checkbox Name="OptionsInstallWindowsRedistX86" X="228" Y="327" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKX86">#(loc.Redist_x86)</Checkbox> | ||
| <Checkbox Name="OptionsInstallAndroidPlatform" X="192" Y="345" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Android)</Checkbox> | ||
| <Checkbox Name="OptionsInstallAndroidSDKARM64" X="210" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_arm64)</Checkbox> | ||
| <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="210" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox> | ||
| <Checkbox Name="OptionsInstallAndroidSDKARM" X="210" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox> | ||
| <Checkbox Name="OptionsInstallAndroidSDKX86" X="210" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox> | ||
| <Checkbox Name="OptionsInstallToolchain" X="192" Y="435" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Toolchain_ProductName)</Checkbox> | ||
| <Checkbox Name="OptionsInstallAssertsToolchain" X="210" Y="453" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallNoAssertsToolchain">#(loc.Asserts_Toolchain_ProductName)</Checkbox> | ||
| <Checkbox Name="OptionsInstallNoAssertsToolchain" X="210" Y="471" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallAssertsToolchain">#(loc.NoAsserts_Toolchain_ProductName)</Checkbox> | ||
| <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0"> | ||
| <Text>#(loc.OptionsOkButton)</Text> | ||
| <ChangePageAction Page="Install" /> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <Project Sdk="WixToolset.Sdk/4.0.5"> | ||
| <PropertyGroup> | ||
| <OutputName>python</OutputName> | ||
compnerd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </PropertyGroup> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| <?define PythonRoot = "$(ImageRoot)\Python-$(PythonVersion)"?> | ||
|
|
||
| <Fragment> | ||
| <DirectoryRef Id="INSTALLROOT"> | ||
| <Directory Id="Python" Name="Python-$(PythonVersion)" > | ||
| <Directory Id="python_licenses" Name="licenses" /> | ||
| </Directory> | ||
| </DirectoryRef> | ||
| </Fragment> | ||
|
There was a problem hiding this comment. Why is this fragment here rather than in a regular tree layout like we do in the platform MSIs? |
||
|
|
||
compnerd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <Package | ||
| Language="1033" | ||
| Manufacturer="!(loc.ManufacturerName)" | ||
| Name="!(loc.EmbeddedPython_ProductName)" | ||
| UpgradeCode="$(PythonUpgradeCode)" | ||
| Version="$(PythonVersion)" | ||
| Scope="$(PackageScope)"> | ||
|
|
||
| <Media Id="1" Cabinet="python.cab" EmbedCab="$(ArePackageCabsEmbedded)" /> | ||
|
|
||
| <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(PythonUpgradeCode)" /> | ||
| <FeatureGroupRef Id="SideBySideUpgradeStrategy" /> | ||
|
|
||
| <ComponentGroup Id="EmbeddedPython" Directory="Python"> | ||
| <Files Include="$(PythonRoot)/**" /> | ||
|
There was a problem hiding this comment. Please explicitly list the files. This is to ensure that we know exactly what is being shipped for licensing purposes. |
||
| </ComponentGroup> | ||
|
|
||
| <ComponentGroup Id="EmbeddedPythonLicense"> | ||
| <Component Directory="python_licenses"> | ||
| <File Source="$(PythonRoot)\LICENSE.txt" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <Feature Id="EmbeddedPython" AllowAbsent="no" Title="$(VariantProductName)"> | ||
| <ComponentGroupRef Id="EmbeddedPython" /> | ||
| <ComponentGroupRef Id="EmbeddedPythonLicense" /> | ||
| </Feature> | ||
| </Package> | ||
| </Wix> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ The bundle authoring (in `installer.wxs`) drives optional install directory and | |
| | 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. | | ||
| | OptionsInstallCLI | Controls whether command-line tools will be installed. | | ||
| | OptionsInstallDBG | Controls whether debugging tools will be installed. | | ||
| | OptionsInstallEmbeddedPython | Controls whether embeddable Python will be installed. | | ||
| | OptionsInstallIDE | Controls whether IDE integration tools will be installed. | | ||
| | OptionsInstallUtilties | Controls whether additional utilities will be installed. | | ||
| | OptionsInstallAndroidPlatform | Controls whether the Android platform will be installed. | | ||
|
|
@@ -177,6 +178,7 @@ To support the three architecture flavors of the SDK and RTL MSI packages, you n | |
| | MSBuild property | Description | | ||
| | ---------------- | ----------- | | ||
| | ImageRoot | Path to the root of the installed Swift image to package | | ||
| | PythonVersion | Version of the Embeddable Python to package | | ||
| | Platforms | Semicolon delimited list of platforms to package (android;windows) | | ||
| | AndroidArchitectures | Semicolon delimited list of architectures the Android platform supports (aarch54;armv7;i686;x86_64) | | ||
| | ToolchainVariants | Semicolon delimited list of toolchain variants to package (assert;noassert) | | ||
|
|
@@ -194,10 +196,11 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer. | |
| -p:Configuration=Release ^ | ||
| -p:BaseOutputPath=%PackageRoot%\online\ ^ | ||
| -p:ImageRoot=%ImageRoot%\Program Files\Swift ^ | ||
| -p:PythonVersion=3.10.1 ^ | ||
| -p:Platforms="android;windows" ^ | ||
| -p:AndroidArchitectures="aarch64;armv7;i686;x86_64" ^ | ||
| -p:WindowsArchitectures="aarch64;i686;x86_64" ^ | ||
| -p:WindowsRuntimeARM64=%ImageRoot%\Program Files (Arm64)\Swift\Runtimes\0.0.0 ^ | ||
compnerd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| -p:WindowsRuntimeX64=%ImageRoot%\Program Files\Swift\Runtimes\0.0.0 ^ | ||
| -p:WindowsRuntimeX86=%ImageRoot%\Program Files (x86)\Swift\Runtimes\0.0.0 | ||
| ``` | ||
|
|
@@ -245,7 +248,7 @@ Note that these GUIDs are substituted at bind time so they skip the normal valid | |
|
|
||
| | Property | Description | | ||
| | -------- | ----------- | | ||
| | BldAssertsUpgradeCode, BldNoAssertsUpgradeCode, CliAssertsUpgradeCode, CliNoAssertsUpgradeCode, DbgAssertsUpgradeCode, DbgNoAssertsUpgradeCode, IdeUpgradeCode, IdeNoUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode, PythonUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. | | ||
| | BundleUpgradeCode | Upgrade codes for the bundle. Bundles don't support upgrade version ranges, so the bundle upgrade code must change for every minor version _and_ stay the same for the entire lifetime of that minor version (e.g., v5.10.0 through v5.10.9999). You can keep the history of upgrade codes using a condition like `Condition="'$(MajorMinorProductVersion)' == '5.10'` or just replace BundleUpgradeCode when forking to a new minor version. | | ||
|
|
||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ | |
| <String Id="Dbg_ProductName" Value="Swift Debugging Tools" /> | ||
| <String Id="DbgAsserts_ProductName" Value="Swift Debugging Tools (Asserts)" /> | ||
| <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools (NoAsserts)" /> | ||
| <String Id="EmbeddedPython_ProductName" Value="Embedded Python" /> | ||
| <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" /> | ||
| <String Id="IdeAsserts_ProductName" Value="Swift IDE Integration Tools (Asserts)" /> | ||
| <String Id="IdeNoAsserts_ProductName" Value="Swift IDE Integration Tools (NoAsserts)" /> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.