Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wix: add help for current internal topics
authorMatt Harbison <matt_harbison@yahoo.com>
Thu, 17 Dec 2015 21:24:08 -0500
changeset 27684 e9857fbfd072
parent 27683 76fc5ac23473
child 27685 9fbae70faf65
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.
contrib/wix/guids.wxi file | annotate | diff | comparison | revisions
contrib/wix/help.wxs file | annotate | diff | comparison | revisions
contrib/wix/mercurial.wxs file | annotate | diff | comparison | revisions
tests/test-install.t file | annotate | diff | comparison | revisions 
--- a/contrib/wix/guids.wxi	Thu Jan 07 14:03:11 2016 -0800
+++ b/contrib/wix/guids.wxi	Thu Dec 17 21:24:08 2015 -0500
@@ -19,7 +19,8 @@
   <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
 
   <!-- help.wxs -->
-  <?define helpFolder.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?>
+  <?define help.root.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} ?>
--- a/contrib/wix/help.wxs	Thu Jan 07 14:03:11 2016 -0800
+++ b/contrib/wix/help.wxs	Thu Dec 17 21:24:08 2015 -0500
@@ -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.help.root.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>
--- a/contrib/wix/mercurial.wxs	Thu Jan 07 14:03:11 2016 -0800
+++ b/contrib/wix/mercurial.wxs	Thu Dec 17 21:24:08 2015 -0500
@@ -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' />
--- a/tests/test-install.t	Thu Jan 07 14:03:11 2016 -0800
+++ b/tests/test-install.t	Thu Dec 17 21:24:08 2015 -0500
@@ -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
mercurial