contrib/wix/doc.wxs
author Martin von Zweigbergk <martinvonz@google.com>
Sun, 02 Dec 2018 13:09:46 -0800
changeset 40782 3984409e144b
parent 13042 bd9bc4123920
permissions -rw-r--r--
match: drop unnecessary wrapping of regex in group It seems the regexes have been wrapped in an unnamed group since b6c42714d900 (Add locate command., 2005-07-05). In that commit, the grouping was needed because there was a "head" ('^') added before the group and a "tail" (os.sep) added after it. It seems the head was moved inside the group in 1c0c413cccdd (Get add and locate to use new repo and dirstate walk code., 2005-07-18) and the tail was moved inside the group in 89985a1b3427 (Clean up walk and changes code to use normalised names properly., 2005-07-31), So it seems to me that we've carried around the unnecessary group for 13 years. This patch removes it. Differential Revision: https://phab.mercurial-scm.org/D5352

<?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="docFolder">
      <ComponentRef Id="doc.hg.1.html" />
      <ComponentRef Id="doc.hgignore.5.html" />
      <ComponentRef Id="doc.hgrc.5.html" />
      <ComponentRef Id="doc.style.css" />
    </ComponentGroup>
  </Fragment>

  <Fragment>
    <DirectoryRef Id="INSTALLDIR">
      <Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)">
        <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)" Win64='$(var.IsX64)'>
          <File Name="hg.1.html" KeyPath="yes">
            <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir"
                      Name="Mercurial Command Reference"
                      Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
            />
          </File>
        </Component>
        <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)" Win64='$(var.IsX64)'>
          <File Name="hgignore.5.html" KeyPath="yes">
            <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir"
                      Name="Mercurial Ignore Files"
                      Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
            />
          </File>
        </Component>
        <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)" Win64='$(var.IsX64)'>
          <File Name="hgrc.5.html" KeyPath="yes">
            <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir"
                      Name="Mercurial Configuration Files"
                      Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
            />
          </File>
        </Component>
        <Component Id="doc.style.css" Guid="$(var.doc.style.css)" Win64='$(var.IsX64)'>
          <File Name="style.css" KeyPath="yes" />
        </Component>
      </Directory>
    </DirectoryRef>
  </Fragment>

</Wix>