Patchwork [V3,clowncopter] wix: add help for current internal topics

login
register
mail settings
Submitter Matt Harbison
Date Jan. 6, 2016, 4:31 a.m.
Message ID <f4ce38f95b196e1114fb.1452054701@Envy>
Download mbox | patch
Permalink /patch/12556/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

Matt Harbison - Jan. 6, 2016, 4:31 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1450405448 18000
#      Thu Dec 17 21:24:08 2015 -0500
# Node ID f4ce38f95b196e1114fba9e069d6c08061493df3
# Parent  8d0a09162d0ffb91bafef6abb36dc1baddb2ca48
wix: add help for current internal 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.
Yuya Nishihara - Jan. 7, 2016, 3:46 p.m.
On Tue, 05 Jan 2016 23:31:41 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1450405448 18000
> #      Thu Dec 17 21:24:08 2015 -0500
> # Node ID f4ce38f95b196e1114fba9e069d6c08061493df3
> # Parent  8d0a09162d0ffb91bafef6abb36dc1baddb2ca48
> wix: add help for current internal 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.

WiX passed and confirmed new files are included in .msi archive. I'll push
this to the clowncopter tomorrow. Thanks.

>    <?define helpFolder.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?>
> +  <?define help.internals.guid = {2DD7669D-0DB8-4C39-9806-78E6475E7ACC} ?>

Nit: It seems helpFolder.guid should be renamed to help.root.guid. I've
changed it in flight.

Patch

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
@@ -5,9 +5,16 @@ 
   <?include defines.wxi ?>
 
   <Fragment>
+    <ComponentGroup Id='helpFolder'>
+      <ComponentRef Id='help.root' />
+      <ComponentRef Id='help.internals' />
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
     <DirectoryRef Id="INSTALLDIR">
       <Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)">
-        <Component Id="helpFolder" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'>
+        <Component Id="help.root" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'>
           <File Name="config.txt" KeyPath="yes" />
           <File Name="dates.txt" />
           <File Name="diffs.txt" />
@@ -28,6 +35,15 @@ 
           <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" />
+            <File Id="internals.revlogs.txt"      Name="revlogs.txt" />
+          </Component>
+        </Directory>
+
       </Directory>
     </DirectoryRef>
   </Fragment>
diff --git a/contrib/wix/mercurial.wxs b/contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs
+++ b/contrib/wix/mercurial.wxs
@@ -124,7 +124,7 @@ 
         <ComponentRef Id='COPYING' />
         <ComponentRef Id='mercurial.rc' />
         <ComponentRef Id='mergetools.rc' />
-        <ComponentRef Id='helpFolder' />
+        <ComponentGroupRef Id='helpFolder' />
         <ComponentGroupRef Id='templatesFolder' />
         <MergeRef Id='VCRuntime' />
         <MergeRef Id='VCRuntimePolicy' />
diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -102,9 +102,6 @@ 
     help/hg.1.txt
     help/hgignore.5.txt
     help/hgrc.5.txt
-    help/internals/bundles.txt
-    help/internals/changegroups.txt
-    help/internals/revlogs.txt
   Not tracked:
 
   $ python wixxml.py templates