comparison contrib/wix/mercurial.wxs @ 13563:391948925b67 stable

wix: drop bin/ folder from MSI installers (issue 2673) Also fixes issue 2658.
author Steve Borho <steve@borho.org>
date Tue, 08 Mar 2011 10:03:01 -0600
parents e5c2338d76b5
children 86531a7038ed
comparison
equal deleted inserted replaced
13559:42a34c0aeddc 13563:391948925b67
60 <Directory Id='$(var.PFolder)' Name='PFiles'> 60 <Directory Id='$(var.PFolder)' Name='PFiles'>
61 <Directory Id='INSTALLDIR' Name='Mercurial'> 61 <Directory Id='INSTALLDIR' Name='Mercurial'>
62 <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'> 62 <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'>
63 <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' /> 63 <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' />
64 <Environment Id="Environment" Name="PATH" Part="last" System="yes" 64 <Environment Id="Environment" Name="PATH" Part="last" System="yes"
65 Permanent="no" Value="[INSTALLDIR]bin" Action="set" /> 65 Permanent="no" Value="[INSTALLDIR]" Action="set" />
66 </Component> 66 </Component>
67 <Component Id='ReadMe' Guid='$(var.ReadMe.guid)' Win64='$(var.IsX64)'> 67 <Component Id='ReadMe' Guid='$(var.ReadMe.guid)' Win64='$(var.IsX64)'>
68 <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html' 68 <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html'
69 KeyPath='yes'/> 69 KeyPath='yes'/>
70 </Component> 70 </Component>
91 <File Id='cacert.pem' Name='cacert.pem' Source='..\misc\cacert.pem' 91 <File Id='cacert.pem' Name='cacert.pem' Source='..\misc\cacert.pem'
92 ReadOnly='yes' KeyPath='yes'/> 92 ReadOnly='yes' KeyPath='yes'/>
93 </Component> 93 </Component>
94 </Directory> 94 </Directory>
95 95
96 <Directory Id='binFolder' Name='bin'>
97 <Component Id='HgCmd' Guid='$(var.hgcmd.guid)' Win64='$(var.IsX64)'>
98 <File Id='Hg.Cmd' Name='hg.cmd' KeyPath='yes' Source='contrib\wix\hg.cmd' />
99 </Component>
100 </Directory>
101 </Directory> 96 </Directory>
102 </Directory> 97 </Directory>
103 98
104 <Directory Id="ProgramMenuFolder" Name="Programs"> 99 <Directory Id="ProgramMenuFolder" Name="Programs">
105 <Directory Id="ProgramMenuDir" Name="Mercurial $(var.Version)"> 100 <Directory Id="ProgramMenuDir" Name="Mercurial $(var.Version)">
138 <ComponentRef Id='mercurial.rc' /> 133 <ComponentRef Id='mercurial.rc' />
139 <ComponentRef Id='mergetools.rc' /> 134 <ComponentRef Id='mergetools.rc' />
140 <ComponentRef Id='paths.rc' /> 135 <ComponentRef Id='paths.rc' />
141 <ComponentRef Id='cacert.pem' /> 136 <ComponentRef Id='cacert.pem' />
142 <ComponentRef Id='helpFolder' /> 137 <ComponentRef Id='helpFolder' />
143 <ComponentRef Id='HgCmd' />
144 <ComponentGroupRef Id='templatesFolder' /> 138 <ComponentGroupRef Id='templatesFolder' />
145 <MergeRef Id='VCRuntime' /> 139 <MergeRef Id='VCRuntime' />
146 <MergeRef Id='VCRuntimePolicy' /> 140 <MergeRef Id='VCRuntimePolicy' />
147 </Feature> 141 </Feature>
148 <Feature Id='Locales' Title='Translations' Description='Translations' Level='1'> 142 <Feature Id='Locales' Title='Translations' Description='Translations' Level='1'>