D7509: windows: further build fixes for the WiX installer
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Fri Nov 22 23:04:17 UTC 2019
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
With these fixes in place, the .msi actually builds for me again.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D7509
AFFECTED FILES
contrib/packaging/hgpackaging/py2exe.py
contrib/packaging/wix/mercurial.wxs
setup.py
CHANGE DETAILS
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -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)
)
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
@@ -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' />
diff --git a/contrib/packaging/hgpackaging/py2exe.py b/contrib/packaging/hgpackaging/py2exe.py
--- a/contrib/packaging/hgpackaging/py2exe.py
+++ b/contrib/packaging/hgpackaging/py2exe.py
@@ -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'),
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list