-
Notifications
You must be signed in to change notification settings - Fork 51
[windows] add an option to install Embeddable Python 3.10.1 in the toolchain installer #447
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ | |
| <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" /> | ||
| <ProjectReference Include="..\dbg\asserts\dbg.asserts.wixproj" BindName="dbg.asserts" /> | ||
| <ProjectReference Include="..\ide\asserts\ide.asserts.wixproj" BindName="ide.asserts" /> | ||
| <ProjectReference Include="..\python\python.wixproj" BindName="python" /> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm half tempted to say that |
||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" $(ToolchainVariants.Contains('noasserts')) "> | ||
|
|
||
| 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> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| <?define PythonRoot = "$(ImageRoot)\Python-$(PythonVersion)"?> | ||
| <?if $(ProductArchitecture) = "arm64"?> | ||
| <?define ArchSuffix = "-arm64"?> | ||
| <?else?> | ||
| <?define ArchSuffix = ""?> | ||
| <?endif?> | ||
| <?define VariantProductName = !(loc.IdeAsserts_ProductName)?> | ||
|
|
||
| <Package | ||
| Language="1033" | ||
| Manufacturer="!(loc.ManufacturerName)" | ||
| Name="!(loc.EmbeddedPython_ProductName)" | ||
| UpgradeCode="$(PythonUpgradeCode)" | ||
| Version="$(NonSemVerProductVersion)" | ||
| Scope="$(PackageScope)"> | ||
|
|
||
| <Media Id="1" Cabinet="python.cab" EmbedCab="$(ArePackageCabsEmbedded)" /> | ||
|
|
||
| <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(PythonUpgradeCode)" /> | ||
| <FeatureGroupRef Id="SideBySideUpgradeStrategy" /> | ||
|
|
||
| <DirectoryRef Id="INSTALLROOT"> | ||
| <Directory Id="python" Name="Python-$(PythonVersion)" /> | ||
| </DirectoryRef> | ||
|
|
||
| <ComponentGroup Id="EmbeddedPython" Directory="python"> | ||
| <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)\vcruntime140.dll" /> | ||
| </Component> | ||
| <Component> | ||
| <File Source="$(PythonRoot)\vcruntime140_1.dll" /> | ||
| </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_asserts_usr_share_licenses"> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This puts the license file in the toolchain directory rather than the python directory. I'm not sure how I feel about that, but we can live with that for now to get this merged. |
||
| <File Source="$(PythonRoot)\LICENSE.txt" /> | ||
| </Component> | ||
| </ComponentGroup> | ||
|
|
||
| <Feature Id="EmbeddedPython" AllowAbsent="no" Title="$(VariantProductName)"> | ||
| <ComponentGroupRef Id="EmbeddedPython" /> | ||
| <ComponentGroupRef Id="EmbeddedPythonLicense" /> | ||
| </Feature> | ||
| </Package> | ||
| </Wix> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing newline. |
||
Uh oh!
There was an error while loading. Please reload this page.