windows: further build fixes for the WiX installer
With these fixes in place, the .msi actually builds for me again.
Differential Revision: https://phab.mercurial-scm.org/D7509
--- a/contrib/packaging/hgpackaging/py2exe.py Thu Nov 21 23:35:29 2019 -0500
+++ b/contrib/packaging/hgpackaging/py2exe.py Fri Nov 22 18:02:12 2019 -0500
@@ -45,7 +45,7 @@
('doc/*.html', 'doc/'),
('doc/style.css', 'doc/'),
('mercurial/helptext/**/*.txt', 'helptext/'),
- ('mercurial/default.d/*.rc', 'hgrc.d/'),
+ ('mercurial/defaultrc/*.rc', 'hgrc.d/'),
('mercurial/locale/**/*', 'locale/'),
('mercurial/templates/**/*', 'Templates/'),
('COPYING', 'Copying.txt'),
--- a/contrib/packaging/wix/mercurial.wxs Thu Nov 21 23:35:29 2019 -0500
+++ b/contrib/packaging/wix/mercurial.wxs Fri Nov 22 18:02:12 2019 -0500
@@ -100,7 +100,7 @@
<ComponentRef Id='ProgramMenuDir' />
<ComponentGroupRef Id="hg.group.ROOT" />
<ComponentGroupRef Id="hg.group.hgrc.d" />
- <ComponentGroupRef Id="hg.group.help" />
+ <ComponentGroupRef Id="hg.group.helptext" />
<ComponentGroupRef Id="hg.group.lib" />
<ComponentGroupRef Id="hg.group.templates" />
<MergeRef Id='VCRuntime' />
--- a/setup.py Thu Nov 21 23:35:29 2019 -0500
+++ b/setup.py Fri Nov 22 18:02:12 2019 -0500
@@ -935,7 +935,7 @@
# This logic is duplicated in doc/Makefile.
sources = set(
f
- for f in os.listdir('mercurial/help')
+ for f in os.listdir('mercurial/helptext')
if re.search(r'[0-9]\.txt$', f)
)