[windows] add Python 3.10.1 to the installer #447
+192
−3
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,6 +101,13 @@ | |
| <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" /> | ||
| </MsiPackage> | ||
|
|
||
| <MsiPackage | ||
| SourceFile="!(bindpath.python)\python.msi" | ||
| InstallCondition="OptionsInstallEmbeddedPython = 1" | ||
| DownloadUrl="$(BaseReleaseDownloadUrl)/{2}"> | ||
| <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" /> | ||
| </MsiPackage> | ||
|
|
||
| <MsiPackage | ||
| SourceFile="!(bindpath.ide.asserts)\ide.asserts.msi" | ||
| InstallCondition="OptionsInstallIDE = 1" | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -73,7 +73,7 @@ | |
| <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="210" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox> | ||
| <Checkbox Name="OptionsInstallAndroidSDKARM" X="210" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox> | ||
| <Checkbox Name="OptionsInstallAndroidSDKX86" X="210" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox> | ||
| <Checkbox Name="OptionsInstallEmbeddedPython" X="192" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.EmbeddedPython_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> | ||||||
|
There was a problem hiding this comment. The msi name should have the variant in it to separate it when we build multiple for each variant
Suggested change
|
||||||
| </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,14 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| <?define VariantName = asserts ?> | ||
| <?define VariantUpgradeCode = $(PythonUpgradeCode)?> | ||
| <?define VariantProductName = !(loc.EmbeddedPython_ProductName)?> | ||
| <?define VariantCabinetName = python.asserts.cab?> | ||
|
There was a problem hiding this comment. I agree with you, the cabinet name should not have There was a problem hiding this comment. we install the embedded-python binaries to a variant-specific folder. so this means that each variant will need a copy. the right approach would be to install python to a non-variant-specific folder, e.g. it is own folder. and add it to the path so that lldb would find it. this way we only have one msi. bonus if we change lldb to use an env var or other input to know where the embedded one is instead of using path for the dll and PYTHONPATH for the libraries. |
||
| <?define ToolchainVersionedVariantDirectory = ToolchainVersionedAsserts ?> | ||
| <?define VariantEnvironmentComponentGUID = 30629e0c-b376-47bc-bedf-fefb7d4ca61d?> | ||
| <?if $(ProductArchitecture) = "arm64" ?> | ||
|
There was a problem hiding this comment. this is not variant specific. i would recommend moving it to the wxi to avoid it being duplicated for diffrent variants. |
||
| <?define ArchSuffix = "-arm64" ?> | ||
| <?else?> | ||
| <?define ArchSuffix = "" ?> | ||
| <?endif?> | ||
| <?include ../python.wxi ?> | ||
| </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 |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
|
|
||
| <Package | ||
| Language="1033" | ||
| Manufacturer="!(loc.ManufacturerName)" | ||
| Name="$(VariantProductName)" | ||
| UpgradeCode="$(VariantUpgradeCode)" | ||
| Version="$(NonSemVerProductVersion)" | ||
| Scope="$(PackageScope)"> | ||
|
|
||
| <Media Id="1" Cabinet="$(VariantCabinetName)" EmbedCab="$(ArePackageCabsEmbedded)" /> | ||
|
|
||
| <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" /> | ||
| <FeatureGroupRef Id="SideBySideUpgradeStrategy" /> | ||
|
|
||
| <ComponentGroup Id="EmbeddedPython" Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <Component > | ||
| <File Source="$(PythonRoot)\libcrypto-1_1$(ArchSuffix).dll" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\libffi-7.dll" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\libssl-1_1$(ArchSuffix).dll" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\pyexpat.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\python.cat" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\python.exe" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\python3.dll" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\python310.dll" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\python310.zip" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\python310._pth" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\pythonw.exe" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\select.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\sqlite3.dll" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\unicodedata.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\winsound.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_asyncio.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_bz2.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_ctypes.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_decimal.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_elementtree.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_hashlib.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_lzma.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_msi.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_multiprocessing.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_overlapped.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_queue.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_socket.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_sqlite3.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_ssl.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_uuid.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component> | ||
| <File Source="$(PythonRoot)\_zoneinfo.pyd" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <ComponentGroup Id="EmbeddedPythonLicense"> | ||
| <Component Directory="toolchain_$(VariantName)_usr_share_licenses"> | ||
| <File Source="$(PythonRoot)\LICENSE.txt" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <Feature Id="EmbeddedPython" AllowAbsent="no" Title="$(VariantProductName)"> | ||
| <ComponentGroupRef Id="EmbeddedPython" /> | ||
| <ComponentGroupRef Id="EmbeddedPythonLicense" /> | ||
| </Feature> | ||
| </Package> | ||
| </Include> |
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. | | ||
|
|
@@ -149,6 +150,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 | | ||
| | PythonRoot | Path to the root of the Python distribution 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) | | ||
| | WindowsArchitectures | Semicolon delimited list of architectures the Windows platform supports (aarch64;i686;x86_64) | | ||
|
|
@@ -165,10 +167,11 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer. | |
| -p:Configuration=Release ^ | ||
| -p:BaseOutputPath=%PackageRoot%\online\ ^ | ||
| -p:ImageRoot=%ImageRoot%\Program Files\Swift ^ | ||
| -p:PythonRoot=%ImageRoot%\Program Files\Python-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 ^ | ||
| -p:WindowsRuntimeX64=%ImageRoot%\Program Files\Swift\Runtimes\0.0.0 ^ | ||
| -p:WindowsRuntimeX86=%ImageRoot%\Program Files (x86)\Swift\Runtimes\0.0.0 | ||
| ``` | ||
|
|
@@ -216,7 +219,7 @@ Note that these GUIDs are substituted at bind time so they skip the normal valid | |
|
|
||
| | Property | Description | | ||
| | -------- | ----------- | | ||
| | BldAssertsUpgradeCode, CliAssertsUpgradeCode, DbgAssertsUpgradeCode, IdeUpgradeCode, 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 |
|---|---|---|
|
|
@@ -55,6 +55,7 @@ | |
| <Directory Id="toolchain_asserts_usr_share_docc" Name="docc"> | ||
| <Directory Id="toolchain_asserts_usr_share_docc_render" Name="render" /> | ||
| </Directory> | ||
| <Directory Id="toolchain_asserts_usr_share_licenses" Name="licenses" /> | ||
| </Directory> | ||
| </Directory> | ||
| </Directory> | ||
|
|
||
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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -8,6 +8,7 @@ | |||||
| <String Id="CliAsserts_ProductName" Value="Swift Command Line Tools (Asserts)" /> | ||||||
| <String Id="Dbg_ProductName" Value="Swift Debugging Tools" /> | ||||||
| <String Id="DbgAsserts_ProductName" Value="Swift Debugging Tools (Asserts)" /> | ||||||
| <String Id="EmbeddedPython_ProductName" Value="Embedded Python 3.10.1" /> | ||||||
|
There was a problem hiding this comment. Since this is variant specific msi, we should have the name reflect that.
Suggested change
|
||||||
| <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" /> | ||||||
| <String Id="IdeAsserts_ProductName" Value="Swift IDE Integration Tools (Asserts)" /> | ||||||
| <String Id="Rtl_ProductName" Value="Swift Windows Runtime" /> | ||||||
|
|
||||||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Name should have variant to allow us to add another one later on.
PythonAssertsUpgradeCode