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

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
new file mode 100644 (file)
index 0000000..118f9df
--- /dev/null
+++ 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
index e8310293159e4c9ca81f2f7dba58189b1bd1ee1d..3d93e892adae8a3a1151ebbe31621e44c69d49c4 100644 (file)
--- a/PC/layout/support/options.py
+++ b/PC/layout/support/options.py
@@ -57,7 +57,6 @@ PRESETS = {
         "help": "nuget package",
         "options": [
             "dev",
-            "tools",
             "pip",
             "stable",
             "distutils",
@@ -76,7 +75,6 @@ PRESETS = {
             "tcltk",
             "idle",
             "tests",
-            "tools",
             "venv",
             "dev",
             "symbols",

diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets
index 89a5960a50efe1192abea3eeaa170ed2319772bb..9c7410fe514d19cd22e8334927aeb50e937c8b7b 100644 (file)
--- 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
index 19e67faf887bc7ae21c73b4a9b47a6215231f8cc..d23158c2cae91c25ff1e792ab11b6765153c5430 100644 (file)
--- 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
deleted file mode 100644 (file)
index 1d9ab19..0000000
--- a/Tools/msi/bundle/packagegroups/tools.wxs
+++ /dev/null
@@ -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>
\ No newline at end of file

diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs
index b819d320ee9481dcd6771d694927512388e586cb..55cb44860d02c02463e08d2a7a2ee338e476d374 100644 (file)
--- 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
deleted file mode 100644 (file)
index 2963048..0000000
--- a/Tools/msi/tools/tools.wixproj
+++ /dev/null
@@ -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>

diff --git a/Tools/msi/tools/tools.wxs b/Tools/msi/tools/tools.wxs
deleted file mode 100644 (file)
index c06b3c2..0000000
--- a/Tools/msi/tools/tools.wxs
+++ /dev/null
@@ -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>

diff --git a/Tools/msi/tools/tools_en-US.wxl b/Tools/msi/tools/tools_en-US.wxl
deleted file mode 100644 (file)
index a138417..0000000
--- a/Tools/msi/tools/tools_en-US.wxl
+++ /dev/null
@@ -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>

diff --git a/Tools/msi/tools/tools_files.wxs b/Tools/msi/tools/tools_files.wxs
deleted file mode 100644 (file)
index 3de6c92..0000000
--- a/Tools/msi/tools/tools_files.wxs
+++ /dev/null
@@ -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>