-
Notifications
You must be signed in to change notification settings - Fork 48
[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" /> | ||
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 | ||||
---|---|---|---|---|---|---|
|
@@ -31,6 +31,7 @@ | |||||
<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="OptionsInstallEmbeddedPython" bal:Overridable="yes" Persisted="yes" Value="1" /> | ||||||
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. Hmm, I think that we want the default to be 0? We shouldn't install the additional python copy by default I think. 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. lldb would not start if python3.10 is not installed. chances that ppl have that version and not say 3.9 or 3.14 are low. i think we should optimize for the majority of users vs advanced users who will need to run custom debugging scripts. so we should keep it on by default 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. What do you think of |
||||||
<Variable Name="OptionsInstallIDE" bal:Overridable="yes" Persisted="yes" Value="1" /> | ||||||
<Variable Name="OptionsInstallRTL" Value="1" /> | ||||||
|
||||||
|
@@ -134,6 +135,13 @@ | |||||
</MsiPackage> | ||||||
<?endif?> | ||||||
|
||||||
<MsiPackage | ||||||
SourceFile="!(bindpath.python)\python.msi" | ||||||
InstallCondition="OptionsInstallEmbeddedPython = 1 and OptionsInstallDBG = 1" | ||||||
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.
Suggested change
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. All the other 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. There are others in the file which are uppercase. I know that I ran into some issues with the case in MSBuild. It is unfortunate that they are not consistently case-insensitive. |
||||||
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}"> | ||||||
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" /> | ||||||
</MsiPackage> | ||||||
|
||||||
<MsiPackage | ||||||
SourceFile="!(bindpath.ide.asserts)\ide.asserts.msi" | ||||||
InstallCondition="OptionsInstallIDE = 1 and OptionsInstallAssertsToolchain = 1" | ||||||
|
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,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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 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> |
Uh oh!
There was an error while loading. Please reload this page.