mharbison72 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12595 AFFECTED FILES contrib/packaging/wix/mercurial.wxs rust/hgcli/pyoxidizer.bzl CHANGE DETAILS diff --git a/rust/hgcli/pyoxidizer.bzl b/rust/hgcli/pyoxidizer.bzl --- a/rust/hgcli/pyoxidizer.bzl +++ b/rust/hgcli/pyoxidizer.bzl @@ -292,7 +292,6 @@ "Platform": platform, "Version": VERSION, "Comments": "Installs Mercurial version %s" % VERSION, - "PythonVersion": "3", "MercurialHasLib": "1", } diff --git a/contrib/packaging/wix/mercurial.wxs b/contrib/packaging/wix/mercurial.wxs --- a/contrib/packaging/wix/mercurial.wxs +++ b/contrib/packaging/wix/mercurial.wxs @@ -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)?> To: mharbison72, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
