Skip to content
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.

Sign up for GitHub

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

gh-97649: The Tools directory is no longer installed on Windows #97653

Merged
merged 1 commit into from
Sep 30, 2022
Merged

gh-97649: The Tools directory is no longer installed on Windows #97653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2022-09-29-22-27-04.gh-issue-97649.bI7OQU.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The ``Tools`` directory is no longer installed on Windows
2 changes: 0 additions & 2 deletions PC/layout/support/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ def public(f):
"help": "nuget package",
"options": [
"dev",
"tools",
"pip",
"stable",
"distutils",
Expand All @@ -76,7 +75,6 @@ def public(f):
"tcltk",
"idle",
"tests",
"tools",
"venv",
"dev",
"symbols",
Expand Down
1 change: 0 additions & 1 deletion Tools/msi/bundle/bundle.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
<Package Include="..\pip\pip*.wixproj" />
<Package Include="..\tcltk\tcltk*.wixproj" />
<Package Include="..\test\test*.wixproj" />
<Package Include="..\tools\tools*.wixproj" />
<Package Include="..\ucrt\ucrt*.wixproj" Condition="$(Platform) != 'ARM64'" />
</ItemGroup>

Expand Down
3 changes: 1 addition & 2 deletions Tools/msi/bundle/bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<Variable Name="Include_lib" 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_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_pip" Value="1" bal:Overridable="yes" />
<Variable Name="Include_launcher" Value="-1" bal:Overridable="yes" />
Expand Down Expand Up @@ -106,7 +106,6 @@
<PackageGroupRef Id="lib" />
<PackageGroupRef Id="test" />
<PackageGroupRef Id="doc" />
<PackageGroupRef Id="tools" />
<PackageGroupRef Id="tcltk" />
<PackageGroupRef Id="launcher" />
<PackageGroupRef Id="pip" />
Expand Down
26 changes: 0 additions & 26 deletions Tools/msi/bundle/packagegroups/tools.wxs
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions Tools/msi/common.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,6 @@
</DirectoryRef>
</Fragment>

<Fragment>
<DirectoryRef Id="InstallDirectory">
<Directory Id="Tools" Name="Tools" />
</DirectoryRef>
</Fragment>

<!-- Start Menu folder -->
<Fragment>
<DirectoryRef Id="TARGETDIR">
Expand Down
38 changes: 0 additions & 38 deletions Tools/msi/tools/tools.wixproj
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions Tools/msi/tools/tools.wxs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions Tools/msi/tools/tools_en-US.wxl
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions Tools/msi/tools/tools_files.wxs
View file
Open in desktop

This file was deleted.