##// END OF EJS Templates
merge: use separate lists for each action type...
merge: use separate lists for each action type This replaces the grand unified action list that had multiple action types as tuples in one big list. That list was iterated multiple times just to find actions of a specific type. This data model also made some code more convoluted than necessary. Instead we now store actions as a tuple of lists. Using multiple lists gives a bit of cut'n'pasted code but also enables other optimizations. This patch uses 'if True:' to preserve indentations and help reviewing. It also limits the number of conflicts with other pending patches. It can trivially be cleaned up later.

File last commit:

r17389:59581b66 stable
r21545:43eecb4e default
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>