##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

setup: prevent setuptools from laying an egg...
setup: prevent setuptools from laying an egg Previously, test-hghave.t was failing on Windows (and on Linux if $FORCE_SETUPTOOLS was set) with the following: --- c:/Users/Matt/Projects/hg/tests/test-hghave.t +++ c:/Users/Matt/Projects/hg/tests/test-hghave.t.err @@ -19,7 +19,11 @@ > foo > EOF $ run-tests.py $HGTEST_RUN_TESTS_PURE test-hghaveaddon.t + warning: Testing with unexpected mercurial lib: c:\Users\Matt\Projects\hg\mercurial + (expected ...\hgtests.mu9rou\install\lib\python\mercurial) . + warning: Tested with unexpected mercurial lib: c:\Users\Matt\Projects\hg\mercurial + (expected ...\hgtests.mu9rou\install\lib\python\mercurial) Augie relayed concerns[1] about the first attempt at this, which also excluded 'install_egg_info'. All that needs to be excluded to avoid the egg and make the test work is to filter out 'bdist_egg'. (Actually, the body of this class could simply be 'pass', and 'bdist_egg' still isn't run. But that seems to magical.) Also note that prior to this (and still now), `make clean` doesn't delete the 'mercurial.egg-info' that is generated by `make install`. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-May/097668.html # no-check-commit
Matt Harbison - - Load All Authors

File last commit:

r32460:5e1a91f6 stable
r32647:331dcf19 default
Show More
dist.wxs
35 lines | 1.3 KiB | text/plain | TextLexer
/ contrib / wix / dist.wxs
History | Source | Raw |Copy content |Copy permalink
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: move library.zip and all *.pyd into a lib/ folder...
 r25409 <File Name="python27.dll" KeyPath="yes" />
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 </Component>
Steve Borho
wix: move library.zip and all *.pyd into a lib/ folder...
 r25409 <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" />
Yuya Nishihara
base85: switch to policy importer
 r32368 <File Name="mercurial.cext.base85.pyd" />
Yuya Nishihara
bdiff: switch to policy importer...
 r32369 <File Name="mercurial.cext.bdiff.pyd" />
Yuya Nishihara
diffhelpers: switch to policy importer...
 r32370 <File Name="mercurial.cext.diffhelpers.pyd" />
Yuya Nishihara
mpatch: switch to policy importer
 r32371 <File Name="mercurial.cext.mpatch.pyd" />
Yuya Nishihara
osutil: switch to policy importer...
 r32367 <File Name="mercurial.cext.osutil.pyd" />
Yuya Nishihara
parsers: switch to policy importer...
 r32372 <File Name="mercurial.cext.parsers.pyd" />
Steve Borho
wix: move library.zip and all *.pyd into a lib/ folder...
 r25409 <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>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 </DirectoryRef>
</Fragment>
</Wix>