Mercurial > hg
changeset 49169:06107198f95b
wix: drop python2 conditionals
Differential Revision: https://phab.mercurial-scm.org/D12595
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 28 Apr 2022 11:01:41 -0400 |
| parents | 5996640fc6fe |
| children | df3e9d98951b |
| files | contrib/packaging/wix/mercurial.wxs rust/hgcli/pyoxidizer.bzl |
| diffstat | 2 files changed, 0 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/packaging/wix/mercurial.wxs Wed Apr 27 19:45:19 2022 +0400 +++ b/contrib/packaging/wix/mercurial.wxs Thu Apr 28 11:01:41 2022 -0400 @@ -79,23 +79,6 @@ </Component> </Directory> </Directory> - - <!-- Install VCRedist merge modules on Python 2. On Python 3, - vcruntimeXXX.dll is part of the install layout and gets picked up - as a regular file. --> - <?if $(var.PythonVersion) = "2" ?> - <?if $(var.Platform) = "x86" ?> - <Merge Id='VCRuntime' DiskId='1' Language='1033' - SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' /> - <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033' - SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' /> - <?else?> - <Merge Id='VCRuntime' DiskId='1' Language='1033' - SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x64_msm.msm' /> - <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033' - SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x64_msm.msm' /> - <?endif?> - <?endif?> </Directory> <Feature Id='Complete' Title='Mercurial' Description='The complete package' @@ -111,10 +94,6 @@ <ComponentGroupRef Id="hg.group.lib" /> <?endif?> <ComponentGroupRef Id="hg.group.templates" /> - <?if $(var.PythonVersion) = "2" ?> - <MergeRef Id='VCRuntime' /> - <MergeRef Id='VCRuntimePolicy' /> - <?endif?> </Feature> <?ifdef MercurialExtraFeatures?> <?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?>