Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

wix: x86 shell extensions must be handled more carefully

Changeset 5628a8beb620…

Parent c5991703c777…

by Steve Borho

Changes to 2 files · Browse files at 5628a8beb620 Showing diff from parent c5991703c777 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​Build.bat Stacked
 
2
3
4
5
 
6
7
8
 
2
3
4
 
5
6
7
8
@@ -2,7 +2,7 @@
 setlocal    if not exist %hhc_compiler%. ( - set hhc_compiler="%ProgramFiles%\HTML Help Workshop\hhc.exe" + set hhc_compiler=hhc.exe  )  set PDFLATEX=PdfLatex  set SPHINXBUILD=sphinx-build
Change 1 of 3 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
 
177
178
179
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
180
181
182
 
287
288
289
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
290
291
292
 
125
126
127
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
128
129
130
 
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
 
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
@@ -125,34 +125,6 @@
  />   </Component>   - <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'> - <File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes' - Source='win32\ThgShellx86.dll' - /> - <RegistryValue - Root='HKLM' Key='$(var.ProgramRegKey)' - Type='string' Value='[INSTALLDIR]' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' - Type='string' Value='[INSTALLDIR]ThgShellx86.dll' - /> - <?foreach CLSID in $(var.OverlayCLSIDList) ?> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32' - Type='string' Value='[INSTALLDIR]ThgShellx86.dll' - /> - <?endforeach?> - </Component> - <Component Id='CmenuShellRegistrationX86' - Guid='$(var.CmenuShellRegistrationX86.guid)' Win64='no'> - <?include shell-register-cmenu.wxi ?> - </Component> - <Component Id='OverlaysShellRegistrationX86' - Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'> - <?include shell-register-overlays.wxi ?> - </Component> -   <?if $(var.Platform) = "x64" ?>   <Component Id='thgshellx64dll' Guid='$(var.thgshellx64dll.guid)' Win64='yes'>   <File Id='thgshellx64dll' Name='ThgShellx64.dll' KeyPath='yes' @@ -177,6 +149,34 @@
  Guid='$(var.OverlaysShellRegistrationX64.guid)'>   <?include shell-register-overlays.wxi ?>   </Component> + <?else?> + <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'> + <File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes' + Source='win32\ThgShellx86.dll' + /> + <RegistryValue + Root='HKLM' Key='$(var.ProgramRegKey)' + Type='string' Value='[INSTALLDIR]' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' + Type='string' Value='[INSTALLDIR]ThgShellx86.dll' + /> + <?foreach CLSID in $(var.OverlayCLSIDList) ?> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32' + Type='string' Value='[INSTALLDIR]ThgShellx86.dll' + /> + <?endforeach?> + </Component> + <Component Id='CmenuShellRegistrationX86' + Guid='$(var.CmenuShellRegistrationX86.guid)' Win64='no'> + <?include shell-register-cmenu.wxi ?> + </Component> + <Component Id='OverlaysShellRegistrationX86' + Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'> + <?include shell-register-overlays.wxi ?> + </Component>   <?endif?>     <Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'> @@ -287,6 +287,40 @@
  </Directory>   </Directory>   + <?if $(var.Platform) = "x64" ?> + <Directory Id="ProgramFilesFolder" Name="Programsx86"> + <Directory Id='INSTALLDIRx86' Name='TortoiseHg'> + <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'> + <File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes' + Source='win32\ThgShellx86.dll' + /> + <RegistryValue + Root='HKLM' Key='$(var.ProgramRegKey)' + Type='string' Value='[INSTALLDIRx86]' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' + Type='string' Value='[INSTALLDIRx86]ThgShellx86.dll' + /> + <?foreach CLSID in $(var.OverlayCLSIDList) ?> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32' + Type='string' Value='[INSTALLDIRx86]ThgShellx86.dll' + /> + <?endforeach?> + </Component> + <Component Id='CmenuShellRegistrationX86' + Guid='$(var.CmenuShellRegistrationX86.guid)' Win64='no'> + <?include shell-register-cmenu.wxi ?> + </Component> + <Component Id='OverlaysShellRegistrationX86' + Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'> + <?include shell-register-overlays.wxi ?> + </Component> + </Directory> + </Directory> + <?endif?> +   <?if $(var.Platform) = "x86" ?>   <Merge Id='VCRedist' DiskId='1' Language='1033'   SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm'/>