diff options
| author | Steve Dower <steve.dower@python.org> | 2022-09-30 09:25:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-30 09:25:00 (GMT) |
| commit | 73942e475c773ff844c231d98c9b37acdc678e9c (patch) | |
| tree | 09495d8ef849450a03c3a7fb614f302f325840c9 /Tools/msi/bundle | |
| parent | 86a3be207dcf3d8f38ad0a85d9ffe3b05b855e1b (diff) | |
| download | cpython-73942e475c773ff844c231d98c9b37acdc678e9c.zip cpython-73942e475c773ff844c231d98c9b37acdc678e9c.tar.gz cpython-73942e475c773ff844c231d98c9b37acdc678e9c.tar.bz2 | |
gh-97649: The Tools directory is no longer installed on Windows (GH-97653)
Diffstat (limited to 'Tools/msi/bundle')
| -rw-r--r-- | Tools/msi/bundle/bundle.targets | 1 | ||||
| -rw-r--r-- | Tools/msi/bundle/bundle.wxs | 3 | ||||
| -rw-r--r-- | Tools/msi/bundle/packagegroups/tools.wxs | 26 |
3 files changed, 1 insertions, 29 deletions
diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets index 89a5960..9c7410f 100644 --- 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 19e67fa..d23158c 100644 --- 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 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 |