This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12595

wix: drop python2 conditionals
ClosedPublic

Authored by mharbison72 on Apr 28 2022, 11:44 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG06107198f95b: wix: drop python2 conditionals

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Apr 28 2022, 11:44 AM
Alphare accepted this revision.Mon, May 9, 11:30 AM
This revision is now accepted and ready to land.Mon, May 9, 11:30 AM
mharbison72 added a commit: rHG06107198f95b: wix: drop python2 conditionals.Mon, May 9, 11:52 AM
Closed by commit rHG06107198f95b: wix: drop python2 conditionals (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 33376

contrib/packaging/wix/mercurial.wxs

<RemoveFolder Id='ProgramMenuDir' On='uninstall' /> <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
<RegistryValue Root='HKCU' Key='Software\Mercurial\InstallDir' Type='string' <RegistryValue Root='HKCU' Key='Software\Mercurial\InstallDir' Type='string'
Value='[INSTALLDIR]' KeyPath='yes' /> Value='[INSTALLDIR]' KeyPath='yes' />
<Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site' <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site'
Target='[ARPHELPLINK]' Icon="hgIcon.ico" IconIndex='0' /> Target='[ARPHELPLINK]' Icon="hgIcon.ico" IconIndex='0' />
</Component> </Component>
</Directory> </Directory>
</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> </Directory>
<Feature Id='Complete' Title='Mercurial' Description='The complete package' <Feature Id='Complete' Title='Mercurial' Description='The complete package'
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' > Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
<Feature Id='MainProgram' Title='Program' Description='Mercurial command line app' <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app'
Level='1' Absent='disallow' > Level='1' Absent='disallow' >
<ComponentRef Id='MainExecutable' /> <ComponentRef Id='MainExecutable' />
<ComponentRef Id='ProgramMenuDir' /> <ComponentRef Id='ProgramMenuDir' />
<ComponentGroupRef Id="hg.group.ROOT" /> <ComponentGroupRef Id="hg.group.ROOT" />
<ComponentGroupRef Id="hg.group.defaultrc" /> <ComponentGroupRef Id="hg.group.defaultrc" />
<ComponentGroupRef Id="hg.group.helptext" /> <ComponentGroupRef Id="hg.group.helptext" />
<?ifdef MercurialHasLib?> <?ifdef MercurialHasLib?>
<ComponentGroupRef Id="hg.group.lib" /> <ComponentGroupRef Id="hg.group.lib" />
<?endif?> <?endif?>
<ComponentGroupRef Id="hg.group.templates" /> <ComponentGroupRef Id="hg.group.templates" />
<?if $(var.PythonVersion) = "2" ?>
<MergeRef Id='VCRuntime' />
<MergeRef Id='VCRuntimePolicy' />
<?endif?>
</Feature> </Feature>
<?ifdef MercurialExtraFeatures?> <?ifdef MercurialExtraFeatures?>
<?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?> <?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?>
<FeatureRef Id="$(var.EXTRAFEAT)" /> <FeatureRef Id="$(var.EXTRAFEAT)" />
<?endforeach?> <?endforeach?>
<?endif?> <?endif?>
<Feature Id='Locales' Title='Translations' Description='Translations' Level='1'> <Feature Id='Locales' Title='Translations' Description='Translations' Level='1'>
<ComponentGroupRef Id="hg.group.locale" /> <ComponentGroupRef Id="hg.group.locale" />

rust/hgcli/pyoxidizer.bzl

wix.install_files_root_directory_id = "INSTALLDIR" wix.install_files_root_directory_id = "INSTALLDIR"
# Pull in our custom .wxs files. # Pull in our custom .wxs files.
defines = { defines = {
"PyOxidizer": "1", "PyOxidizer": "1",
"Platform": platform, "Platform": platform,
"Version": VERSION, "Version": VERSION,
"Comments": "Installs Mercurial version %s" % VERSION, "Comments": "Installs Mercurial version %s" % VERSION,
"PythonVersion": "3",
"MercurialHasLib": "1", "MercurialHasLib": "1",
} }
if EXTRA_MSI_FEATURES: if EXTRA_MSI_FEATURES:
defines["MercurialExtraFeatures"] = EXTRA_MSI_FEATURES defines["MercurialExtraFeatures"] = EXTRA_MSI_FEATURES
wix.add_wxs_file( wix.add_wxs_file(
ROOT + "/contrib/packaging/wix/mercurial.wxs", ROOT + "/contrib/packaging/wix/mercurial.wxs",