view contrib/wix/doc.wxs @ 37775:03d7f885d5f2

revsetlang: do not pass in non-bytes to parse()

Since parse() isn't a simple function, we shouldn't expect it would raise
TypeError or ValueError for invalid inputs. Before, TypeError was raised
at 'if pos != len(spec)', which was quite late to report an error.

This patch also makes tokenize() detect invalid object before converting
it to a py3-safe bytes.

Spotted while adding the 'revset(...)' hack to _parsewith().

<?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>