D7165: packaging: stop installing i18n files
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Sat Nov 9 00:06:19 UTC 2019
Closed by commit rHGb7db6302af1f: packaging: stop installing i18n files (authored by indygreg).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7165?vs=17386&id=17817
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7165/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7165
AFFECTED FILES
contrib/packaging/hgpackaging/wix.py
contrib/packaging/wix/guids.wxi
contrib/packaging/wix/i18n.wxs
contrib/packaging/wix/mercurial.wxs
CHANGE DETAILS
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
@@ -136,7 +136,6 @@
<?endif?>
<Feature Id='Locales' Title='Translations' Description='Translations' Level='1'>
<ComponentGroupRef Id='localeFolder' />
- <ComponentRef Id='i18nFolder' />
</Feature>
<Feature Id='Documentation' Title='Documentation' Description='HTML man pages' Level='1'>
<ComponentGroupRef Id='docFolder' />
diff --git a/contrib/packaging/wix/i18n.wxs b/contrib/packaging/wix/i18n.wxs
deleted file mode 100644
--- a/contrib/packaging/wix/i18n.wxs
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>
diff --git a/contrib/packaging/wix/guids.wxi b/contrib/packaging/wix/guids.wxi
--- a/contrib/packaging/wix/guids.wxi
+++ b/contrib/packaging/wix/guids.wxi
@@ -22,9 +22,6 @@
<?define help.root.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?>
<?define help.internals.guid = {2DD7669D-0DB8-4C39-9806-78E6475E7ACC} ?>
- <!-- i18n.wxs -->
- <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?>
-
<!-- templates.wxs -->
<?define templates.root.guid = {437FD55C-7756-4EA0-87E5-FDBE75DC8595} ?>
<?define templates.atom.guid = {D30E14A5-8AF0-4268-8B00-00BEE9E09E39} ?>
diff --git a/contrib/packaging/hgpackaging/wix.py b/contrib/packaging/hgpackaging/wix.py
--- a/contrib/packaging/hgpackaging/wix.py
+++ b/contrib/packaging/hgpackaging/wix.py
@@ -28,7 +28,6 @@
('dist.wxs', r'dist'),
('doc.wxs', r'doc'),
('help.wxs', r'mercurial\help'),
- ('i18n.wxs', r'i18n'),
('locale.wxs', r'mercurial\locale'),
('templates.wxs', r'mercurial\templates'),
]
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list