##// END OF EJS Templates
mergetools.hgrc: set vimdiff to check=changed...
mergetools.hgrc: set vimdiff to check=changed The standard reaction in from of unexpected vimdiff is to ":quit". This will make vimdiff return a 0 status even if no merge were done at all. This change detect that nothing have been changed in vimdiff as a potential unresolved conflict.

File last commit:

r17389:59581b66 stable
r17422:93bc65e9 stable
Show More
dist.wxs
31 lines | 1.0 KiB | text/plain | TextLexer
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041 <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?include defines.wxi ?>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041
<Fragment>
<DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041 <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" />
Steve Borho
wix: bump MSI based installers to use Python 2.7...
r17389 <File Name="python27.dll" />
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041 <File Name="bz2.pyd" />
<File Name="select.pyd" />
<File Name="unicodedata.pyd" />
Adrian Buehlmann
port win32.py to using the Python ctypes library...
r13375 <File Name="_ctypes.pyd" />
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
r13041 <File Name="_elementtree.pyd" />
<File Name="_hashlib.pyd" />
<File Name="_socket.pyd" />
<File Name="_ssl.pyd" />
</Component>
</DirectoryRef>
</Fragment>
</Wix>