view contrib/wix/dist.wxs @ 28033:0707bbec682d

tests: omit -p for external diff via extdiff extension for portability

Before this patch, some tests using external "diff" command via
extdiff extension fail on Solaris, because "-p" (show which C function
each change is in) option isn't supported by system standard "diff" on
Solaris, even though extdiff passes it to external "diff" by default.

Fortunately, this non-portable option isn't important for (current, at
least) tests using external "diff" command via extdiff extension.

This patch omits "-p" for external "diff" command via extdiff
extension for portability of tests, and adds check-code.py a rule to
detect invocation of "diff" with "-p".

Newly added check-code.py rule examines only lines generated by
external "diff" with "-r", because strict examination might
misidentify "hg diff -p" or other complicated lines consisting of
"diff" string as wrong one.

This patch is a part of making tests using external "diff" portable,
and tests below aren't yet portable even after this patch.

  test-graft.t
  test-largefiles-update.t
  test-subrepo-deep-nested-change.t

<?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.base85.pyd" />
          <File Name="mercurial.bdiff.pyd" />
          <File Name="mercurial.diffhelpers.pyd" />
          <File Name="mercurial.mpatch.pyd" />
          <File Name="mercurial.osutil.pyd" />
          <File Name="mercurial.parsers.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="_hashlib.pyd" />
          <File Name="_socket.pyd" />
          <File Name="_ssl.pyd" />
        </Component>
      </Directory>
    </DirectoryRef>
  </Fragment>

</Wix>