This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7165

packaging: stop installing i18n files
ClosedPublic

Authored by indygreg on Oct 23 2019, 9:54 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGce96be208ea4: packaging: stop installing i18n files
rHGb7db6302af1f: packaging: stop installing i18n files
Summary

The WiX installer has been shipping the content of the i18n/
directory since it was introduced in 2010 in 1e022c88a0a5.
And the installer was subsequently refactored to only ship
the .po files and hggettext.

The .po files and the hggettext script are only used at build
time to produce .mo files, which Mercurial does use at run-time.

It doesn't make sense to install these files on Windows. So
this commit stops doing that.

This change further converges the file layout of the Inno and
WiX installers.

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

indygreg created this revision.Oct 23 2019, 9:54 PM
indygreg added a commit: rHGb7db6302af1f: packaging: stop installing i18n files.Nov 8 2019, 7:05 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb7db6302af1f: packaging: stop installing i18n files (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 17817

contrib/packaging/hgpackaging/wix.py

) )
SUPPORT_WXS = [ SUPPORT_WXS = [
('contrib.wxs', r'contrib'), ('contrib.wxs', r'contrib'),
('dist.wxs', r'dist'), ('dist.wxs', r'dist'),
('doc.wxs', r'doc'), ('doc.wxs', r'doc'),
('help.wxs', r'mercurial\help'), ('help.wxs', r'mercurial\help'),
('i18n.wxs', r'i18n'),
('locale.wxs', r'mercurial\locale'), ('locale.wxs', r'mercurial\locale'),
('templates.wxs', r'mercurial\templates'), ('templates.wxs', r'mercurial\templates'),
] ]
EXTRA_PACKAGES = { EXTRA_PACKAGES = {
'distutils', 'distutils',
'pygments', 'pygments',

contrib/packaging/wix/guids.wxi

<?define doc.hgignore.5.html.guid = {AA9118C4-F3A0-4429-A5F4-5A1906B2D67F} ?> <?define doc.hgignore.5.html.guid = {AA9118C4-F3A0-4429-A5F4-5A1906B2D67F} ?>
<?define doc.hgrc.5.html = {E0CEA1EB-FA01-408c-844B-EE5965165BAE} ?> <?define doc.hgrc.5.html = {E0CEA1EB-FA01-408c-844B-EE5965165BAE} ?>
<?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?> <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
<!-- help.wxs --> <!-- help.wxs -->
<?define help.root.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?> <?define help.root.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?>
<?define help.internals.guid = {2DD7669D-0DB8-4C39-9806-78E6475E7ACC} ?> <?define help.internals.guid = {2DD7669D-0DB8-4C39-9806-78E6475E7ACC} ?>
<!-- i18n.wxs -->
<?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?>
<!-- templates.wxs --> <!-- templates.wxs -->
<?define templates.root.guid = {437FD55C-7756-4EA0-87E5-FDBE75DC8595} ?> <?define templates.root.guid = {437FD55C-7756-4EA0-87E5-FDBE75DC8595} ?>
<?define templates.atom.guid = {D30E14A5-8AF0-4268-8B00-00BEE9E09E39} ?> <?define templates.atom.guid = {D30E14A5-8AF0-4268-8B00-00BEE9E09E39} ?>
<?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?> <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
<?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?> <?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?>
<?define templates.json.guid = {F535BE7A-EC34-46E0-B9BE-013F3DBAFB19} ?> <?define templates.json.guid = {F535BE7A-EC34-46E0-B9BE-013F3DBAFB19} ?>
<?define templates.monoblue.guid = {8060A1E4-BD4C-453E-92CB-9536DC44A9E3} ?> <?define templates.monoblue.guid = {8060A1E4-BD4C-453E-92CB-9536DC44A9E3} ?>
<?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?> <?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?>

contrib/packaging/wix/i18n.wxs

  • This file was deleted.
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include guids.wxi ?>
<?include defines.wxi ?>
<?define hg_po_langs =
da;de;el;fr;it;ja;pt_BR;ro;ru;sv;zh_CN;zh_TW
?>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="i18ndir" Name="i18n" FileSource="$(var.SourceDir)">
<Component Id="i18nFolder" Guid="$(var.i18nFolder.guid)" Win64='$(var.IsX64)'>
<File Name="hggettext" KeyPath="yes" />
<?foreach LANG in $(var.hg_po_langs) ?>
<File Id="hg.$(var.LANG).po"
Name="$(var.LANG).po"
/>
<?endforeach?>
</Component>
</Directory>
</DirectoryRef>
</Fragment>
</Wix>

contrib/packaging/wix/mercurial.wxs

</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='localeFolder' /> <ComponentGroupRef Id='localeFolder' />
<ComponentRef Id='i18nFolder' />
</Feature> </Feature>
<Feature Id='Documentation' Title='Documentation' Description='HTML man pages' Level='1'> <Feature Id='Documentation' Title='Documentation' Description='HTML man pages' Level='1'>
<ComponentGroupRef Id='docFolder' /> <ComponentGroupRef Id='docFolder' />
</Feature> </Feature>
<Feature Id='Misc' Title='Miscellaneous' Description='Contributed scripts' Level='1'> <Feature Id='Misc' Title='Miscellaneous' Description='Contributed scripts' Level='1'>
<ComponentGroupRef Id='contribFolder' /> <ComponentGroupRef Id='contribFolder' />
</Feature> </Feature>
</Feature> </Feature>
contrib/packaging/hgpackaging/wix.py