contrib/wix/contrib.wxs

util: adjust hgcmd() to handle frozen Mercurial on OS X

Previously, 'hg serve -d' was trying to exec the bundled python executable,
which failed with:

    Unknown option: --
    usage: python [option] ...
    Try 'python -h'...
    abort: child process failed to start

See the previous patch for details about the content of the various command
variables.  Note that unlike the previous patch here an application bundling
Mercurial could set $HG in the environment to get the correct result, there
isn't anything that a bundling application could do to get the correct result
here.

'hg serve -d' now launches under TortoiseHg, and there is a process listed in
the background, but a client process cannot connect to it for some reason, so
more investigation is needed.

<?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="contribFolder">
      <ComponentRef Id="contrib" />
      <ComponentRef Id="contrib.vim" />
    </ComponentGroup>
  </Fragment>

  <Fragment>
    <DirectoryRef Id="INSTALLDIR">
      <Directory Id="contribdir" Name="contrib" FileSource="$(var.SourceDir)">
        <Component Id="contrib" Guid="$(var.contrib.guid)" Win64='$(var.IsX64)'>
          <File Name="bash_completion" KeyPath="yes" />
          <File Name="hgk" />
          <File Name="hgweb.fcgi" />
          <File Name="hgweb.wsgi" />
          <File Name="logo-droplets.svg" />
          <File Name="mercurial.el" />
          <File Name="tcsh_completion" />
          <File Name="tcsh_completion_build.sh" />
          <File Name="xml.rnc" />
          <File Name="zsh_completion" />
        </Component>
        <Directory Id="vimdir" Name="vim">
          <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)" Win64='$(var.IsX64)'>
            <File Name="hg-menu.vim" KeyPath="yes" />
            <File Name="HGAnnotate.vim" />
            <File Name="hgcommand.vim" />
            <File Name="patchreview.txt" />
            <File Name="patchreview.vim" />
            <File Name="hgtest.vim" />
          </Component>
        </Directory>
      </Directory>
    </DirectoryRef>
  </Fragment>

</Wix>