# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 2019-11-12 02:51:55
# Node ID 697c2e32c49041f19f9a6c85dd9d327e2818fb65
# Parent  92bb5bacd8078439e6d24d0de5801cde90d6212a

packaging: ship all help .txt files on WiX

These are technically not needed. But it is easier to ship
all files than to cherry-pick. A `make install` will copy
these files, so the new behavior is consistent with that.
This also makes WiX consistent with Inno, which is my main
reason for doing this.

If we don't want to ship the files (which is a valid argument),
I think we can do that in a follow up.

Differential Revision: https://phab.mercurial-scm.org/D7166

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" />
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 @@ Verify the json works too:
 
   $ ( 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 )