# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1651158101 14400
# Node ID 06107198f95b3cb1c7b6c40461fca103efa5bd40
# Parent  5996640fc6feed2357dde9097720133295c27398
wix: drop python2 conditionals

Differential Revision: https://phab.mercurial-scm.org/D12595

diff -r 5996640fc6fe -r 06107198f95b contrib/packaging/wix/mercurial.wxs
--- 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)?>
diff -r 5996640fc6fe -r 06107198f95b rust/hgcli/pyoxidizer.bzl
--- a/rust/hgcli/pyoxidizer.bzl	Wed Apr 27 19:45:19 2022 +0400
+++ b/rust/hgcli/pyoxidizer.bzl	Thu Apr 28 11:01:41 2022 -0400
@@ -292,7 +292,6 @@
         "Platform": platform,
         "Version": VERSION,
         "Comments": "Installs Mercurial version %s" % VERSION,
-        "PythonVersion": "3",
         "MercurialHasLib": "1",
     }