Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wix: drop python2 conditionals
authorMatt Harbison <matt_harbison@yahoo.com>
Thu, 28 Apr 2022 11:01:41 -0400
changeset 49169 06107198f95b
parent 49168 5996640fc6fe
child 49170 df3e9d98951b
wix: drop python2 conditionals Differential Revision: https://phab.mercurial-scm.org/D12595
contrib/packaging/wix/mercurial.wxs file | annotate | diff | comparison | revisions
rust/hgcli/pyoxidizer.bzl file | annotate | diff | comparison | revisions 
--- 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)?>
--- 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",
     }
Mercurial