From patchwork Fri Nov 22 23:13:44 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D7509: windows: further build fixes for the WiX installer
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 43452
Message-Id: <7259ff9d68afff443e955356e37b7c15@localhost.localdomain>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Fri, 22 Nov 2019 23:13:44 +0000

Closed by commit rHGe8373b215a67: windows: further build fixes for the WiX installer (authored by durin42).
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/D7509?vs=18323&id=18324

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7509/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7509

AFFECTED FILES
  contrib/packaging/hgpackaging/py2exe.py
  contrib/packaging/wix/mercurial.wxs
  setup.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

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'),