Mercurial > hg
changeset 25409:95e042d77a5f
wix: move library.zip and all *.pyd into a lib/ folder
This makes the root install folder (on Windows) nice and tidy. The
only files left in the root folder are:
hg.exe
python27.dll
COPYING.rtf
ReadMe.html
the last of which was probably out-of-date 7 years ago
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Wed, 03 Jun 2015 14:31:19 -0500 |
| parents | c88975a4d264 |
| children | eee88912db0a |
| files | contrib/wix/dist.wxs contrib/wix/guids.wxi contrib/wix/mercurial.wxs setup.py |
| diffstat | 4 files changed, 26 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/wix/dist.wxs Wed May 20 11:31:38 2015 -0500 +++ b/contrib/wix/dist.wxs Wed Jun 03 14:31:19 2015 -0500 @@ -7,24 +7,28 @@ <Fragment> <DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)"> <Component Id="distOutput" Guid="$(var.dist.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="python27.dll" /> - <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" /> + <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>
--- a/contrib/wix/guids.wxi Wed May 20 11:31:38 2015 -0500 +++ b/contrib/wix/guids.wxi Wed Jun 03 14:31:19 2015 -0500 @@ -9,7 +9,8 @@ <?define contrib.vim.guid = {BB04903A-652D-4C4F-9590-2BD07A2304F2} ?> <!-- dist.wxs --> - <?define dist.guid = {C3B634A4-1B05-4A40-94A9-38EE853CF693} ?> + <?define dist.guid = {CE405FE6-CD1E-4873-9C9A-7683AE5A3D90} ?> + <?define lib.guid = {91D53B14-E924-432A-ACA2-65F9B3F7C56A} ?> <!-- doc.wxs --> <?define doc.hg.1.html.guid = {AAAA3FDA-EDC5-4220-B59D-D342722358A2} ?>
--- a/contrib/wix/mercurial.wxs Wed May 20 11:31:38 2015 -0500 +++ b/contrib/wix/mercurial.wxs Wed Jun 03 14:31:19 2015 -0500 @@ -118,6 +118,7 @@ Level='1' Absent='disallow' > <ComponentRef Id='MainExecutable' /> <ComponentRef Id='distOutput' /> + <ComponentRef Id='libOutput' /> <ComponentRef Id='ProgramMenuDir' /> <ComponentRef Id='ReadMe' /> <ComponentRef Id='COPYING' />
--- a/setup.py Wed May 20 11:31:38 2015 -0500 +++ b/setup.py Wed Jun 03 14:31:19 2015 -0500 @@ -557,6 +557,8 @@ 'product_version':version}] # sub command of 'build' because 'py2exe' does not handle sub_commands build.sub_commands.insert(0, ('build_hgextindex', None)) + # put dlls in sub directory so that they won't pollute PATH + extra['zipfile'] = 'lib/library.zip' if os.name == 'nt': # Windows binary file versions for exe/dll files must have the