mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-25 17:59:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gh-97649: The Tools directory is no longer installed on Windows (GH-97653)

Browse source
This commit is contained in:
Steve Dower 2022-09-30 10:25:00 +01:00 • committed by GitHub
parent 86a3be207d
commit 73942e475c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 2 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2022-09-29-22-27-04.gh-issue-97649.bI7OQU.rst Normal file
View file

@ -0,0 +1 @@
The ``Tools`` directory is no longer installed on Windows

2
PC/layout/support/options.py
View file

@ -57,7 +57,6 @@ PRESETS = {
"help": "nuget package", "help": "nuget package",
"options": [ "options": [
"dev", "dev",
"tools",
"pip", "pip",
"stable", "stable",
"distutils", "distutils",
@ -76,7 +75,6 @@ PRESETS = {
"tcltk", "tcltk",
"idle", "idle",
"tests", "tests",
"tools",
"venv", "venv",
"dev", "dev",
"symbols", "symbols",

1
Tools/msi/bundle/bundle.targets
View file

@ -71,7 +71,6 @@
<Package Include="..\pip\pip*.wixproj" /> <Package Include="..\pip\pip*.wixproj" />
<Package Include="..\tcltk\tcltk*.wixproj" /> <Package Include="..\tcltk\tcltk*.wixproj" />
<Package Include="..\test\test*.wixproj" /> <Package Include="..\test\test*.wixproj" />
<Package Include="..\tools\tools*.wixproj" />
<Package Include="..\ucrt\ucrt*.wixproj" Condition="$(Platform) != 'ARM64'" /> <Package Include="..\ucrt\ucrt*.wixproj" Condition="$(Platform) != 'ARM64'" />
</ItemGroup> </ItemGroup>

3
Tools/msi/bundle/bundle.wxs
View file

@ -71,7 +71,7 @@
<Variable Name="Include_lib" Value="1" bal:Overridable="yes" /> <Variable Name="Include_lib" Value="1" bal:Overridable="yes" />
<Variable Name="Include_test" Value="1" bal:Overridable="yes" /> <Variable Name="Include_test" Value="1" bal:Overridable="yes" />
<Variable Name="Include_doc" Value="1" bal:Overridable="yes" /> <Variable Name="Include_doc" Value="1" bal:Overridable="yes" />
<Variable Name="Include_tools" Value="1" bal:Overridable="yes" /> <Variable Name="Include_tools" Value="0" bal:Overridable="yes" />
<Variable Name="Include_tcltk" Value="1" bal:Overridable="yes" /> <Variable Name="Include_tcltk" Value="1" bal:Overridable="yes" />
<Variable Name="Include_pip" Value="1" bal:Overridable="yes" /> <Variable Name="Include_pip" Value="1" bal:Overridable="yes" />
<Variable Name="Include_launcher" Value="-1" bal:Overridable="yes" /> <Variable Name="Include_launcher" Value="-1" bal:Overridable="yes" />
@ -106,7 +106,6 @@
<PackageGroupRef Id="lib" /> <PackageGroupRef Id="lib" />
<PackageGroupRef Id="test" /> <PackageGroupRef Id="test" />
<PackageGroupRef Id="doc" /> <PackageGroupRef Id="doc" />
<PackageGroupRef Id="tools" />
<PackageGroupRef Id="tcltk" /> <PackageGroupRef Id="tcltk" />
<PackageGroupRef Id="launcher" /> <PackageGroupRef Id="launcher" />
<PackageGroupRef Id="pip" /> <PackageGroupRef Id="pip" />

26
Tools/msi/bundle/packagegroups/tools.wxs
View file

@ -1,26 +0,0 @@
<?xml version="1.0"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<PackageGroup Id="tools">
<MsiPackage Id="tools_AllUsers"
SourceFile="tools.msi"
Compressed="$(var.CompressMSI)"
DownloadUrl="$(var.DownloadUrl)"
ForcePerMachine="yes"
InstallCondition="InstallAllUsers and Include_tools and not LauncherOnly">
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
</MsiPackage>
<MsiPackage Id="tools_JustForMe"
SourceFile="tools.msi"
Compressed="$(var.CompressMSI)"
DownloadUrl="$(var.DownloadUrl)"
ForcePerMachine="no"
InstallCondition="not InstallAllUsers and Include_tools and not LauncherOnly">
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY" Value="[OptionalFeaturesRegistryKey]" />
</MsiPackage>
</PackageGroup>
</Fragment>
</Wix>

6
Tools/msi/common.wxs
View file

@ -121,12 +121,6 @@
</DirectoryRef> </DirectoryRef>
</Fragment> </Fragment>
<Fragment>
<DirectoryRef Id="InstallDirectory">
<Directory Id="Tools" Name="Tools" />
</DirectoryRef>
</Fragment>
<!-- Start Menu folder --> <!-- Start Menu folder -->
<Fragment> <Fragment>
<DirectoryRef Id="TARGETDIR"> <DirectoryRef Id="TARGETDIR">

38
Tools/msi/tools/tools.wixproj
View file

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{24CBEB95-BC1E-4EA9-AEA9-33834BCCD0EC}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>tools</OutputName>
<OutputType>Package</OutputType>
</PropertyGroup>
<Import Project="..\msi.props" />
<ItemGroup>
<Compile Include="tools.wxs" />
<Compile Include="tools_files.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
<InstallFiles Include="$(PySourcePath)Tools\scripts\**\*.py;
$(PySourcePath)Tools\scripts\**\*.pyw;
$(PySourcePath)Tools\scripts\**\*.txt;
$(PySourcePath)Tools\i18n\**\*.py;
$(PySourcePath)Tools\i18n\**\*.pyw;
$(PySourcePath)Tools\i18n\**\*.txt;
$(PySourcePath)Tools\demo\**\*.py;
$(PySourcePath)Tools\demo\**\*.pyw;
$(PySourcePath)Tools\demo\**\*.txt;
$(PySourcePath)Tools\parser\**\*.py">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
<Target_></Target_>
<Group>tools_py</Group>
<IncludeInCat>true</IncludeInCat>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
</Project>

17
Tools/msi/tools/tools.wxs
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
<Package InstallerVersion="500" Compressed="yes" InstallScope="perUser" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<PropertyRef Id="DetectTargetDir" />
<PropertyRef Id="UpgradeTable" />
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="tools_py" />
<ComponentGroupRef Id="tools_scripts" />
<ComponentGroupRef Id="tools_cat" />
<ComponentRef Id="OptionalFeature" />
</Feature>
</Product>
</Wix>

5
Tools/msi/tools/tools_en-US.wxl
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="Descriptor">Utility Scripts</String>
<String Id="ShortDescriptor">tools</String>
</WixLocalization>

20
Tools/msi/tools/tools_files.wxs
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<ComponentGroup Id="tools_scripts">
<Component Id="Tools_scripts_2to3.py" Directory="Tools_scripts" Guid="*">
<File Id="Tools_scripts_2to3.py" Name="2to3.py" Source="!(bindpath.src)Tools\scripts\2to3" />
</Component>
<Component Id="Tools_scripts_pydoc3.py" Directory="Tools_scripts" Guid="*">
<File Id="Tools_scripts_pydoc3.py" Name="pydoc3.py" Source="!(bindpath.src)Tools\scripts\pydoc3" />
</Component>
</ComponentGroup>
</Fragment>
<Fragment>
<ComponentGroup Id="tools_cat">
<Component Id="tools_cat" Directory="Catalogs" Guid="*">
<File Name="python_tools.cat" KeyPath="yes" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>