[Updated] D12595: wix: drop python2 conditionals

[mharbison72 (Matt Harbison)]

Closed by commit rHG06107198f95b: wix: drop python2 conditionals (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12595?vs=33326&id=33376

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12595/new/

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, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220509/45fb4d59/attachment-0002.html>