[PATCH V2] wix: add help for bundle and changegroup topics

Matt Harbison mharbison72 at gmail.com
Mon Dec 21 06:11:15 UTC 2015


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1450405448 18000
#      Thu Dec 17 21:24:08 2015 -0500
# Node ID fedf1803f4703558e63342d25d8063b6a1a63827
# Parent  7a92182315d3ade8b736687eb0aafd3511c27709
wix: add help for bundle and changegroup topics

This makes the changes in a79cba6cb206 and 84784f834b3a available on Windows.

I'm not setup to make the installer, so someone with experience in this area
should probably give it a look.  In looking around to try to figure out how to
build the installer, it looks like the Makefile may need an update to $DOCFILES.

diff --git a/contrib/wix/guids.wxi b/contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi
+++ b/contrib/wix/guids.wxi
@@ -20,6 +20,7 @@
 
   <!-- help.wxs -->
   <?define helpFolder.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?>
+  <?define help.internals.guid = {2DD7669D-0DB8-4C39-9806-78E6475E7ACC} ?>
 
   <!-- i18n.wxs -->
   <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?>
diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs
--- a/contrib/wix/help.wxs
+++ b/contrib/wix/help.wxs
@@ -28,6 +28,14 @@
           <File Name="templates.txt" />
           <File Name="urls.txt" />
         </Component>
+
+        <Directory Id="help.internaldir" Name="internals">
+          <Component Id="help.internals" Guid="$(var.help.internals.guid)" Win64='$(var.IsX64)'>
+            <File Id="internals.bundles.txt"      Name="bundles.txt" KeyPath="yes" />
+            <File Id="internals.changegroups.txt" Name="changegroups.txt" />
+          </Component>
+        </Directory>
+
       </Directory>
     </DirectoryRef>
   </Fragment>
diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -102,8 +102,6 @@
     help/hg.1.txt
     help/hgignore.5.txt
     help/hgrc.5.txt
-    help/internals/bundles.txt
-    help/internals/changegroups.txt
   Not tracked:
 
   $ python wixxml.py templates


More information about the Mercurial-devel mailing list