changeset 43617:697c2e32c490

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
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 11 Nov 2019 18:51:55 -0800
parents 92bb5bacd807
children c5f6f58f6c71
files contrib/packaging/wix/help.wxs tests/test-install.t
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/packaging/wix/help.wxs	Wed Oct 23 12:31:15 2019 -0700
+++ b/contrib/packaging/wix/help.wxs	Mon Nov 11 18:51:55 2019 -0800
@@ -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" />
--- a/tests/test-install.t	Wed Oct 23 12:31:15 2019 -0700
+++ b/tests/test-install.t	Mon Nov 11 18:51:55 2019 -0800
@@ -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 )