[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
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,11 @@ | ||||||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||||||
| <?define VariantName = asserts ?> | ||||||
|
There was a problem hiding this comment. Do we need the |
||||||
| <?define VariantUpgradeCode = $(PythonUpgradeCode)?> | ||||||
| <?define VariantProductName = !(loc.EmbeddedPython_ProductName)?> | ||||||
| <?define VariantCabinetName = python.asserts.cab?> | ||||||
compnerd marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment.
Suggested change
Comment on lines
+3
to
+5
There was a problem hiding this comment. I think that we should be able to drop the |
||||||
| <?define ToolchainVersionedVariantDirectory = ToolchainVersionedAsserts ?> | ||||||
|
There was a problem hiding this comment. Do we need the |
||||||
| <?define VariantEnvironmentComponentGUID = 30629e0c-b376-47bc-bedf-fefb7d4ca61d?> | ||||||
| <?define PythonRoot = "$(ImageRoot)\Python"?> | ||||||
|
|
||||||
| <?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,159 @@ | ||
| <?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"> | ||
|
There was a problem hiding this comment. Can the directory attribute be moved to the |
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\libcrypto-1_1-arm64.dll" /> | ||
|
There was a problem hiding this comment. Is this file included on both ARM64 and AMD64? There was a problem hiding this comment. It's not, I've added the |
||
| </Component> | ||
|
|
||
|
There was a problem hiding this comment. I would drop the whitespace between the components. |
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\libffi-7.dll" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\libssl-1_1-arm64.dll" /> | ||
|
There was a problem hiding this comment. It's not, I've added the |
||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\LICENSE.txt" /> | ||
| </Component> | ||
|
There was a problem hiding this comment. Why is the There was a problem hiding this comment. I did not know about |
||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\pyexpat.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\python.cat" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\python.exe" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\python3.dll" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\python310.dll" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\python310.zip" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\python310._pth" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\pythonw.exe" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\select.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\sqlite3.dll" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\unicodedata.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\vcruntime140.dll" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\vcruntime140_1.dll" /> | ||
| </Component> | ||
|
There was a problem hiding this comment. This brings up the question - do we want to bundle an additional copy of the VCRuntime? This is an interesting question because the toolchain itself also does depend on the runtime. There is a copy in the system. And now in python. The system one however will get security updates, this will not. Since part of the argument for this upgrade is "security" - we shouldn't be bundling them IMO. |
||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\winsound.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_asyncio.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_bz2.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_ctypes.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_decimal.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_elementtree.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_hashlib.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_lzma.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_msi.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_multiprocessing.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_overlapped.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_queue.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_socket.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_sqlite3.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_ssl.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_uuid.pyd" /> | ||
| </Component> | ||
|
|
||
| <Component Directory="toolchain_$(VariantName)_usr_bin"> | ||
| <File Source="$(PythonRoot)\_zoneinfo.pyd" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <Feature Id="EmbeddedPython" AllowAbsent="yes" Title="$(VariantProductName)"> | ||
|
There was a problem hiding this comment. I don't think that we should allow this component to be absent. We would install nothing then. |
||
| <ComponentGroupRef Id="EmbeddedPython" /> | ||
| </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
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
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.