##// END OF EJS Templates
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
Steve Borho -
r13041:79388a83 stable
parent child Browse files
Show More
@@ -0,0 +1,39 b''
1 <?xml version="1.0" encoding="utf-8"?>
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3
4 <?include guids.wxi ?>
5
6 <Fragment>
7 <DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)">
8 <Component Id="distOutput" Guid="$(var.dist.guid)">
9 <File Name="library.zip" KeyPath="yes" />
10 <File Name="mercurial.base85.pyd" />
11 <File Name="mercurial.bdiff.pyd" />
12 <File Name="mercurial.diffhelpers.pyd" />
13 <File Name="mercurial.mpatch.pyd" />
14 <File Name="mercurial.osutil.pyd" />
15 <File Name="mercurial.parsers.pyd" />
16 <File Name="pyexpat.pyd" />
17 <File Name="python26.dll" />
18 <File Name="pythoncom26.dll" />
19 <File Name="pywintypes26.dll" />
20 <File Name="bz2.pyd" />
21 <File Name="select.pyd" />
22 <File Name="unicodedata.pyd" />
23 <File Name="win32api.pyd" />
24 <File Name="win32com.shell.shell.pyd" />
25 <File Name="win32console.pyd" />
26 <File Name="win32file.pyd" />
27 <File Name="win32gui.pyd" />
28 <File Name="win32pipe.pyd" />
29 <File Name="win32process.pyd" />
30 <File Name="_elementtree.pyd" />
31 <File Name="_hashlib.pyd" />
32 <File Name="_socket.pyd" />
33 <File Name="_ssl.pyd" />
34 <File Name="_win32sysloader.pyd" />
35 </Component>
36 </DirectoryRef>
37 </Fragment>
38
39 </Wix>
@@ -0,0 +1,3 b''
1 @echo off
2 rem launch hg.exe from parent folder
3 "%~dp0\..\hg.exe" %*
@@ -8,6 +8,9 b''
8 8 <?define contrib.guid = {F17D27B7-4A6B-4cd2-AE72-FED3CFAA585E} ?>
9 9 <?define contrib.vim.guid = {BB04903A-652D-4C4F-9590-2BD07A2304F2} ?>
10 10
11 <!-- dist.wxs -->
12 <?define dist.guid = {0F63D160-0740-4BAF-BF25-0C6930310F51} ?>
13
11 14 <!-- doc.wxs -->
12 15 <?define doc.hg.1.html.guid = {AAAA3FDA-EDC5-4220-B59D-D342722358A2} ?>
13 16 <?define doc.hgignore.5.html.guid = {AA9118C4-F3A0-4429-A5F4-5A1906B2D67F} ?>
@@ -42,5 +45,6 b''
42 45 <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?>
43 46 <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?>
44 47 <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
48 <?define hgcmd.guid = {65CCC756-E72E-4C5F-901E-D575EDC80DB3} ?>
45 49
46 50 </Include>
@@ -8,6 +8,12 b''
8 8
9 9 <?include guids.wxi ?>
10 10
11 <?if $(var.Platform) = "x64" ?>
12 <?define IsX64 = yes ?>
13 <?else?>
14 <?define IsX64 = no ?>
15 <?endif?>
16
11 17 <Product Id='*'
12 18 Name='Mercurial $(var.Version)'
13 19 UpgradeCode='$(var.ProductUpgradeCode)'
@@ -52,10 +58,8 b''
52 58 <Directory Id='INSTALLDIR' Name='Mercurial'>
53 59 <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)'>
54 60 <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' />
55 <File Id='libraryZIP' Name='library.zip' Source='dist\library.zip' />
56 <File Id='pythonDLL' Name='python26.dll' Source='dist\python26.dll' />
57 61 <Environment Id="Environment" Name="PATH" Part="last" System="yes"
58 Permanent="no" Value="[INSTALLDIR]" Action="set" />
62 Permanent="no" Value="[INSTALLDIR]bin" Action="set" />
59 63 </Component>
60 64 <Component Id='ReadMe' Guid='$(var.ReadMe.guid)'>
61 65 <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html'
@@ -65,6 +69,7 b''
65 69 <File Id='COPYING' Name='COPYING.rtf' Source='contrib\wix\COPYING.rtf'
66 70 KeyPath='yes'/>
67 71 </Component>
72
68 73 <Directory Id='HGRCD' Name='hgrc.d'>
69 74 <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)'>
70 75 <File Id='mercurial.rc' Name='Mercurial.rc' Source='contrib\win32\mercurial.ini'
@@ -75,6 +80,12 b''
75 80 ReadOnly='yes' KeyPath='yes'/>
76 81 </Component>
77 82 </Directory>
83
84 <Directory Id='binFolder' Name='bin'>
85 <Component Id='HgCmd' Guid='$(var.hgcmd.guid)'>
86 <File Id='Hg.Cmd' Name='hg.cmd' KeyPath='yes' Source='contrib\wix\hg.cmd' />
87 </Component>
88 </Directory>
78 89 </Directory>
79 90 </Directory>
80 91
@@ -101,12 +112,14 b''
101 112 <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app'
102 113 Level='1' Absent='disallow' >
103 114 <ComponentRef Id='MainExecutable' />
115 <ComponentRef Id='distOutput' />
104 116 <ComponentRef Id='ProgramMenuDir' />
105 117 <ComponentRef Id='ReadMe' />
106 118 <ComponentRef Id='COPYING' />
107 119 <ComponentRef Id='mercurial.rc' />
108 120 <ComponentRef Id='mergetools.rc' />
109 121 <ComponentRef Id='helpFolder' />
122 <ComponentRef Id='HgCmd' />
110 123 <ComponentGroupRef Id='templatesFolder' />
111 124 <MergeRef Id='VCRuntime' />
112 125 <MergeRef Id='VCRuntimePolicy' />
General Comments 0
You need to be logged in to leave comments. Login now