gh-97649: The Tools directory is no longer installed on Windows (GH-9…

…7653)
python · Sep 30, 2022 · 73942e4 · 73942e4
1 parent 86a3be2
commit 73942e4
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 117 deletions.
diff --git a/Misc/NEWS.d/next/Windows/2022-09-29-22-27-04.gh-issue-97649.bI7OQU.rst b/Misc/NEWS.d/next/Windows/2022-09-29-22-27-04.gh-issue-97649.bI7OQU.rst
@@ -0,0 +1 @@
+The ``Tools`` directory is no longer installed on Windows
diff --git a/PC/layout/support/options.py b/PC/layout/support/options.py
@@ -57,7 +57,6 @@ def public(f):
         "help": "nuget package",
         "options": [
             "dev",
-            "tools",
             "pip",
             "stable",
             "distutils",
@@ -76,7 +75,6 @@ def public(f):
             "tcltk",
             "idle",
             "tests",
-            "tools",
             "venv",
             "dev",
             "symbols",

diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets
@@ -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>
 

diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
@@ -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" />
@@ -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" />

diff --git a/Tools/msi/bundle/packagegroups/tools.wxs b/Tools/msi/bundle/packagegroups/tools.wxs
diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs
@@ -121,12 +121,6 @@
         </DirectoryRef>
     </Fragment>
 
-    <Fragment>
-        <DirectoryRef Id="InstallDirectory">
-            <Directory Id="Tools" Name="Tools" />
-        </DirectoryRef>
-    </Fragment>
-
     <!-- Start Menu folder -->
     <Fragment>
         <DirectoryRef Id="TARGETDIR">

diff --git a/Tools/msi/tools/tools.wixproj b/Tools/msi/tools/tools.wixproj
diff --git a/Tools/msi/tools/tools.wxs b/Tools/msi/tools/tools.wxs
diff --git a/Tools/msi/tools/tools_en-US.wxl b/Tools/msi/tools/tools_en-US.wxl
diff --git a/Tools/msi/tools/tools_files.wxs b/Tools/msi/tools/tools_files.wxs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		The ``Tools`` directory is no longer installed on Windows