contrib/wix/dist.wxs

match: resolve 'set:' patterns first in _buildmatch()

This just makes the next patch less complicated. The order of 'set:' and
'subinclude:' expansion doesn't matter.

<?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" FileSource="$(var.SourceDir)">
      <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'>
        <File Name="python27.dll" KeyPath="yes" />
      </Component>
      <Directory Id="libdir" Name="lib" FileSource="$(var.SourceDir)/lib">
        <Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'>
          <File Name="library.zip" KeyPath="yes" />
          <File Name="mercurial.cext.base85.pyd" />
          <File Name="mercurial.cext.bdiff.pyd" />
          <File Name="mercurial.cext.mpatch.pyd" />
          <File Name="mercurial.cext.osutil.pyd" />
          <File Name="mercurial.cext.parsers.pyd" />
          <File Name="mercurial.zstd.pyd" />
          <File Name="hgext.fsmonitor.pywatchman.bser.pyd" />
          <File Name="pyexpat.pyd" />
          <File Name="bz2.pyd" />
          <File Name="select.pyd" />
          <File Name="unicodedata.pyd" />
          <File Name="_ctypes.pyd" />
          <File Name="_elementtree.pyd" />
          <File Name="_testcapi.pyd" />
          <File Name="_hashlib.pyd" />
          <File Name="_socket.pyd" />
          <File Name="_ssl.pyd" />
        </Component>
      </Directory>
    </DirectoryRef>
  </Fragment>

</Wix>