wix: catch up with more added files

revsets:  1.7::tip and adds("mercurial/help/**")
          1.7::tip and adds("mercurial/templates/**")

contrib/wix/guids.wxi

@@ -1,51 +1,51 b''
 <Include>
   <!-- These are component GUIDs used for Mercurial installers.
        YOU MUST CHANGE ALL GUIDs below when copying this file
        and replace 'Mercurial' in this notice with the name of
        your project. Component GUIDs have global namespace!      -->
 
   <!-- contrib.wxs -->
   <?define contrib.guid = {F17D27B7-4A6B-4cd2-AE72-FED3CFAA585E} ?>
   <?define contrib.vim.guid = {BB04903A-652D-4C4F-9590-2BD07A2304F2} ?>
 
   <!-- dist.wxs -->
   <?define dist.guid = {C3B634A4-1B05-4A40-94A9-38EE853CF693} ?>
 
   <!-- doc.wxs -->
   <?define doc.hg.1.html.guid = {AAAA3FDA-EDC5-4220-B59D-D342722358A2} ?>
   <?define doc.hgignore.5.html.guid = {AA9118C4-F3A0-4429-A5F4-5A1906B2D67F} ?>
   <?define doc.hgrc.5.html = {E0CEA1EB-FA01-408c-844B-EE5965165BAE} ?>
   <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
 
   <!-- help.wxs -->
-  <?define helpFolder.guid = {21FE9CF9-933E-4C2E-B2EC-413A569FB996} ?>
+  <?define helpFolder.guid = {84025FAA-7EB7-4D79-A097-D2D18852D78E} ?>
   
   <!-- i18n.wxs -->
   <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?>
 
   <!-- templates.wxs -->
   <?define templates.root.guid = {111509CB-4C96-4035-80BC-F66A99CD5ACB} ?>
-  <?define templates.atom.guid = {45FCDF84-DE27-44f4-AF6C-C41F5994AE0D} ?>
+  <?define templates.atom.guid = {AB5D2908-BC95-44BE-9D79-069EF43D93E2} ?>
   <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
-  <?define templates.gitweb.guid = {D8BFE3ED-06DD-4C4D-A00D-6D825955F922} ?>
-  <?define templates.monoblue.guid = {A394B4D5-2AF7-4AAC-AEA8-E92176E5501E} ?>
+  <?define templates.gitweb.guid = {6A33D168-F84E-45AA-912C-23CAC2D66BCA} ?>
+  <?define templates.monoblue.guid = {D27AA750-9394-4DAC-84FC-A546CE8F347A} ?>
   <?define templates.paper.guid = {D2591E56-709E-49F9-8A5F-1359E1CCD7E0} ?>
   <?define templates.raw.guid = {04DE03A2-FBFD-4c5f-8DEA-5436DDF4689D} ?>
-  <?define templates.rss.guid = {A7D608DE-0CF6-44f4-AF1E-EE30CC237FDA} ?>
+  <?define templates.rss.guid = {36069748-1E2A-472B-A212-506CB656A9C1} ?>
   <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
   <?define templates.static.guid = {B27D7311-050A-4A96-9971-B674A0EA21D0} ?>
 
   <!-- mercurial.wxs -->
   <?define ProductUpgradeCode = {A1CC6134-E945-4399-BE36-EB0017FDF7CF} ?>
 
   <?define ComponentMainExecutableGUID = {D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF} ?>
 
   <?define ReadMe.guid = {56A8E372-991D-4DCA-B91D-93D775974CF5} ?>
   <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?>
   <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?>
   <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?>
   <?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?>
   <?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?>
   <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
 
 </Include>

contrib/wix/help.wxs

@@ -1,31 +1,33 b''
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?include guids.wxi ?>
   <?include defines.wxi ?>
 
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
       <Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)">
         <Component Id="helpFolder" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'>
           <File Name="config.txt" KeyPath="yes" />
           <File Name="dates.txt" />
           <File Name="diffs.txt" />
           <File Name="environment.txt" />
           <File Name="extensions.txt" />
+          <File Name="filesets.txt" />
           <File Name="glossary.txt" />
+          <File Name="hgignore.txt" />
           <File Name="hgweb.txt" />
           <File Name="merge-tools.txt" />
           <File Name="multirevs.txt" />
           <File Name="patterns.txt" />
           <File Name="revisions.txt" />
           <File Name="revsets.txt" />
           <File Name="subrepos.txt" />
           <File Name="templates.txt" />
           <File Name="urls.txt" />
         </Component>
       </Directory>
     </DirectoryRef>
   </Fragment>
 
 </Wix>

contrib/wix/templates.wxs

@@ -1,215 +1,221 b''
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?include guids.wxi ?>
   <?include defines.wxi ?>
 
   <Fragment>
     <ComponentGroup Id="templatesFolder">
 
       <ComponentRef Id="templates.root" />
 
       <ComponentRef Id="templates.atom" />
       <ComponentRef Id="templates.coal" />
       <ComponentRef Id="templates.gitweb" />
       <ComponentRef Id="templates.monoblue" />
       <ComponentRef Id="templates.paper" />
       <ComponentRef Id="templates.raw" />
       <ComponentRef Id="templates.rss" />
       <ComponentRef Id="templates.spartan" />
       <ComponentRef Id="templates.static" />
 
     </ComponentGroup>
   </Fragment>
 
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
 
       <Directory Id="templatesdir" Name="templates" FileSource="$(var.SourceDir)">
 
         <Component Id="templates.root" Guid="$(var.templates.root.guid)" Win64='$(var.IsX64)'>
           <File Name="map-cmdline.changelog" KeyPath="yes" />
           <File Name="map-cmdline.compact" />
           <File Name="map-cmdline.default" />
           <File Name="map-cmdline.xml" />
           <File Name="template-vars.txt" />
         </Component>
 
         <Directory Id="templates.atomdir" Name="atom">
           <Component Id="templates.atom" Guid="$(var.templates.atom.guid)" Win64='$(var.IsX64)'>
             <File Id="atom.changelog.tmpl"      Name="changelog.tmpl" KeyPath="yes" />
             <File Id="atom.changelogentry.tmpl" Name="changelogentry.tmpl" />
             <File Id="atom.error.tmpl"          Name="error.tmpl" />
             <File Id="atom.filelog.tmpl"        Name="filelog.tmpl" />
             <File Id="atom.header.tmpl"         Name="header.tmpl" />
             <File Id="atom.map"                 Name="map" />
             <File Id="atom.tagentry.tmpl"       Name="tagentry.tmpl" />
             <File Id="atom.tags.tmpl"           Name="tags.tmpl" />
+            <File Id="atom.bookmarks.tmpl"      Name="bookmarks.tmpl" />
+            <File Id="atom.bookmarkentry.tmpl"  Name="bookmarkentry.tmpl" />
           </Component>
         </Directory>
 
         <Directory Id="templates.coaldir" Name="coal">
           <Component Id="templates.coal" Guid="$(var.templates.coal.guid)" Win64='$(var.IsX64)'>
             <File Id="coal.header.tmpl" Name="header.tmpl" KeyPath="yes" />
             <File Id="coal.map"         Name="map" />
           </Component>
         </Directory>
 
         <Directory Id="templates.gitwebdir" Name="gitweb">
           <Component Id="templates.gitweb" Guid="$(var.templates.gitweb.guid)" Win64='$(var.IsX64)'>
             <File Id="gitweb.branches.tmpl"       Name="branches.tmpl" KeyPath="yes" />
+            <File Id="gitweb.bookmarks.tmpl"      Name="bookmarks.tmpl" />
             <File Id="gitweb.changelog.tmpl"      Name="changelog.tmpl" />
             <File Id="gitweb.changelogentry.tmpl" Name="changelogentry.tmpl" />
             <File Id="gitweb.changeset.tmpl"      Name="changeset.tmpl" />
             <File Id="gitweb.error.tmpl"          Name="error.tmpl" />
             <File Id="gitweb.fileannotate.tmpl"   Name="fileannotate.tmpl" />
             <File Id="gitweb.filediff.tmpl"       Name="filediff.tmpl" />
             <File Id="gitweb.filelog.tmpl"        Name="filelog.tmpl" />
             <File Id="gitweb.filerevision.tmpl"   Name="filerevision.tmpl" />
             <File Id="gitweb.footer.tmpl"         Name="footer.tmpl" />
             <File Id="gitweb.graph.tmpl"          Name="graph.tmpl" />
             <File Id="gitweb.header.tmpl"         Name="header.tmpl" />
             <File Id="gitweb.index.tmpl"          Name="index.tmpl" />
             <File Id="gitweb.manifest.tmpl"       Name="manifest.tmpl" />
             <File Id="gitweb.map"                 Name="map" />
             <File Id="gitweb.notfound.tmpl"       Name="notfound.tmpl" />
             <File Id="gitweb.search.tmpl"         Name="search.tmpl" />
             <File Id="gitweb.shortlog.tmpl"       Name="shortlog.tmpl" />
             <File Id="gitweb.summary.tmpl"        Name="summary.tmpl" />
             <File Id="gitweb.tags.tmpl"           Name="tags.tmpl" />
             <File Id="gitweb.help.tmpl"           Name="help.tmpl" />
             <File Id="gitweb.helptopics.tmpl"     Name="helptopics.tmpl" />
           </Component>
         </Directory>
 
         <Directory Id="templates.monobluedir" Name="monoblue">
           <Component Id="templates.monoblue" Guid="$(var.templates.monoblue.guid)" Win64='$(var.IsX64)'>
             <File Id="monoblue.branches.tmpl"       Name="branches.tmpl" KeyPath="yes" />
+            <File Id="monoblue.bookmarks.tmpl"      Name="bookmarks.tmpl" />
             <File Id="monoblue.changelog.tmpl"      Name="changelog.tmpl" />
             <File Id="monoblue.changelogentry.tmpl" Name="changelogentry.tmpl" />
             <File Id="monoblue.changeset.tmpl"      Name="changeset.tmpl" />
             <File Id="monoblue.error.tmpl"          Name="error.tmpl" />
             <File Id="monoblue.fileannotate.tmpl"   Name="fileannotate.tmpl" />
             <File Id="monoblue.filediff.tmpl"       Name="filediff.tmpl" />
             <File Id="monoblue.filelog.tmpl"        Name="filelog.tmpl" />
             <File Id="monoblue.filerevision.tmpl"   Name="filerevision.tmpl" />
             <File Id="monoblue.footer.tmpl"         Name="footer.tmpl" />
             <File Id="monoblue.graph.tmpl"          Name="graph.tmpl" />
             <File Id="monoblue.header.tmpl"         Name="header.tmpl" />
             <File Id="monoblue.index.tmpl"          Name="index.tmpl" />
             <File Id="monoblue.manifest.tmpl"       Name="manifest.tmpl" />
             <File Id="monoblue.map"                 Name="map" />
             <File Id="monoblue.notfound.tmpl"       Name="notfound.tmpl" />
             <File Id="monoblue.search.tmpl"         Name="search.tmpl" />
             <File Id="monoblue.shortlog.tmpl"       Name="shortlog.tmpl" />
             <File Id="monoblue.summary.tmpl"        Name="summary.tmpl" />
             <File Id="monoblue.tags.tmpl"           Name="tags.tmpl" />
             <File Id="monoblue.help.tmpl"           Name="help.tmpl" />
             <File Id="monoblue.helptopics.tmpl"     Name="helptopics.tmpl" />
           </Component>
         </Directory>
 
         <Directory Id="templates.paperdir" Name="paper">
           <Component Id="templates.paper" Guid="$(var.templates.paper.guid)" Win64='$(var.IsX64)'>
             <File Id="paper.branches.tmpl"      Name="branches.tmpl" KeyPath="yes" />
             <File Id="paper.bookmarks.tmpl"     Name="bookmarks.tmpl" />
             <File Id="paper.changeset.tmpl"     Name="changeset.tmpl" />
             <File Id="paper.diffstat.tmpl"      Name="diffstat.tmpl" />
             <File Id="paper.error.tmpl"         Name="error.tmpl" />
             <File Id="paper.fileannotate.tmpl"  Name="fileannotate.tmpl" />
             <File Id="paper.filediff.tmpl"      Name="filediff.tmpl" />
             <File Id="paper.filelog.tmpl"       Name="filelog.tmpl" />
             <File Id="paper.filelogentry.tmpl"  Name="filelogentry.tmpl" />
             <File Id="paper.filerevision.tmpl"  Name="filerevision.tmpl" />
             <File Id="paper.footer.tmpl"        Name="footer.tmpl" />
             <File Id="paper.graph.tmpl"         Name="graph.tmpl" />
             <File Id="paper.header.tmpl"        Name="header.tmpl" />
             <File Id="paper.index.tmpl"         Name="index.tmpl" />
             <File Id="paper.manifest.tmpl"      Name="manifest.tmpl" />
             <File Id="paper.map"                Name="map" />
             <File Id="paper.notfound.tmpl"      Name="notfound.tmpl" />
             <File Id="paper.search.tmpl"        Name="search.tmpl" />
             <File Id="paper.shortlog.tmpl"      Name="shortlog.tmpl" />
             <File Id="paper.shortlogentry.tmpl" Name="shortlogentry.tmpl" />
             <File Id="paper.tags.tmpl"          Name="tags.tmpl" />
             <File Id="paper.help.tmpl"          Name="help.tmpl" />
             <File Id="paper.helptopics.tmpl"    Name="helptopics.tmpl" />
           </Component>
         </Directory>
 
         <Directory Id="templates.rawdir" Name="raw">
           <Component Id="templates.raw" Guid="$(var.templates.raw.guid)" Win64='$(var.IsX64)'>
             <File Id="raw.changeset.tmpl"    Name="changeset.tmpl" KeyPath="yes" />
             <File Id="raw.error.tmpl"        Name="error.tmpl" />
             <File Id="raw.fileannotate.tmpl" Name="fileannotate.tmpl" />
             <File Id="raw.filediff.tmpl"     Name="filediff.tmpl" />
             <File Id="raw.index.tmpl"        Name="index.tmpl" />
             <File Id="raw.manifest.tmpl"     Name="manifest.tmpl" />
             <File Id="raw.map"               Name="map" />
             <File Id="raw.notfound.tmpl"     Name="notfound.tmpl" />
           </Component>
         </Directory>
 
         <Directory Id="templates.rssdir" Name="rss">
           <Component Id="templates.rss" Guid="$(var.templates.rss.guid)" Win64='$(var.IsX64)'>
             <File Id="rss.changelog.tmpl"      Name="changelog.tmpl" KeyPath="yes" />
             <File Id="rss.changelogentry.tmpl" Name="changelogentry.tmpl" />
             <File Id="rss.error.tmpl"          Name="error.tmpl" />
             <File Id="rss.filelog.tmpl"        Name="filelog.tmpl" />
             <File Id="rss.filelogentry.tmpl"   Name="filelogentry.tmpl" />
             <File Id="rss.header.tmpl"         Name="header.tmpl" />
             <File Id="rss.map"                 Name="map" />
             <File Id="rss.tagentry.tmpl"       Name="tagentry.tmpl" />
             <File Id="rss.tags.tmpl"           Name="tags.tmpl" />
+            <File Id="rss.bookmarks.tmpl"      Name="bookmarks.tmpl" />
+            <File Id="rss.bookmarkentry.tmpl"  Name="bookmarkentry.tmpl" />
           </Component>
         </Directory>
 
         <Directory Id="templates.spartandir" Name="spartan">
           <Component Id="templates.spartan" Guid="$(var.templates.spartan.guid)" Win64='$(var.IsX64)'>
             <File Id="spartan.branches.tmpl"       Name="branches.tmpl" KeyPath="yes" />
             <File Id="spartan.changelog.tmpl"      Name="changelog.tmpl" />
             <File Id="spartan.changelogentry.tmpl" Name="changelogentry.tmpl" />
             <File Id="spartan.changeset.tmpl"      Name="changeset.tmpl" />
             <File Id="spartan.error.tmpl"          Name="error.tmpl" />
             <File Id="spartan.fileannotate.tmpl"   Name="fileannotate.tmpl" />
             <File Id="spartan.filediff.tmpl"       Name="filediff.tmpl" />
             <File Id="spartan.filelog.tmpl"        Name="filelog.tmpl" />
             <File Id="spartan.filelogentry.tmpl"   Name="filelogentry.tmpl" />
             <File Id="spartan.filerevision.tmpl"   Name="filerevision.tmpl" />
             <File Id="spartan.footer.tmpl"         Name="footer.tmpl" />
             <File Id="spartan.graph.tmpl"          Name="graph.tmpl" />
             <File Id="spartan.header.tmpl"         Name="header.tmpl" />
             <File Id="spartan.index.tmpl"          Name="index.tmpl" />
             <File Id="spartan.manifest.tmpl"       Name="manifest.tmpl" />
             <File Id="spartan.map"                 Name="map" />
             <File Id="spartan.notfound.tmpl"       Name="notfound.tmpl" />
             <File Id="spartan.search.tmpl"         Name="search.tmpl" />
             <File Id="spartan.shortlog.tmpl"       Name="shortlog.tmpl" />
             <File Id="spartan.shortlogentry.tmpl"  Name="shortlogentry.tmpl" />
             <File Id="spartan.tags.tmpl"           Name="tags.tmpl" />
           </Component>
         </Directory>
 
         <Directory Id="templates.staticdir" Name="static">
           <Component Id="templates.static" Guid="$(var.templates.static.guid)" Win64='$(var.IsX64)'>
             <File Id="static.background.png"     Name="background.png" KeyPath="yes" />
             <File Id="static.coal.file.png"      Name="coal-file.png" />
             <File Id="static.coal.folder.png"    Name="coal-folder.png" />
             <File Id="static.excanvas.js"        Name="excanvas.js" />
             <File Id="static.mercurial.js"       Name="mercurial.js" />
             <File Id="static.hgicon.png"         Name="hgicon.png" />
             <File Id="static.hglogo.png"         Name="hglogo.png" />
             <File Id="static.style.coal.css"     Name="style-coal.css" />
             <File Id="static.style.gitweb.css"   Name="style-gitweb.css" />
             <File Id="static.style.monoblue.css" Name="style-monoblue.css" />
             <File Id="static.style.paper.css"    Name="style-paper.css" />
             <File Id="static.style.css"          Name="style.css" />
           </Component>
         </Directory>
 
       </Directory>
 
     </DirectoryRef>
   </Fragment>
 
  </Wix>