Patchwork D7166: packaging: ship all help .txt files on WiX

login
register
mail settings
Submitter phabricator
Date Nov. 12, 2019, 2:57 a.m.
Message ID <a655967cf9fee9e39ae47b8d4c1cf4c6@localhost.localdomain>
Download mbox | patch
Permalink /patch/43136/
State Not Applicable
Headers show

Comments

phabricator - Nov. 12, 2019, 2:57 a.m.
indygreg updated this revision to Diff 18031.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7166?vs=17818&id=18031

BRANCH
  default

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

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

AFFECTED FILES
  contrib/packaging/wix/help.wxs
  tests/test-install.t

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: martinvonz, mercurial-devel

Patch

diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -223,11 +223,6 @@ 
 
   $ ( testrepohgenv; "$PYTHON" wixxml.py help )
   Not installed:
-    help/common.txt
-    help/hg-ssh.8.txt
-    help/hg.1.txt
-    help/hgignore.5.txt
-    help/hgrc.5.txt
   Not tracked:
 
   $ ( testrepohgenv; "$PYTHON" wixxml.py templates )
diff --git a/contrib/packaging/wix/help.wxs b/contrib/packaging/wix/help.wxs
--- a/contrib/packaging/wix/help.wxs
+++ b/contrib/packaging/wix/help.wxs
@@ -17,6 +17,7 @@ 
         <Component Id="help.root" Guid="$(var.help.root.guid)" Win64='$(var.IsX64)'>
           <File Name="bundlespec.txt" />
           <File Name="color.txt" />
+          <File Name="common.txt" />
           <File Name="config.txt" KeyPath="yes" />
           <File Name="dates.txt" />
           <File Name="deprecated.txt" />
@@ -26,7 +27,11 @@ 
           <File Name="filesets.txt" />
           <File Name="flags.txt" />
           <File Name="glossary.txt" />
+          <File Name="hg-ssh.8.txt" />
+          <File Name="hg.1.txt" />
+          <File Name="hgignore.5.txt" />
           <File Name="hgignore.txt" />
+          <File Name="hgrc.5.txt" />
           <File Name="hgweb.txt" />
           <File Name="merge-tools.txt" />
           <File Name="pager.txt" />