Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in tip

stable wix: these parts were moved into the shellext repo

Changeset dd8a1df45f03…

Parent 88e7a6c9b120…

by Adrian Buehlmann

Changes to 2 files · Browse files at dd8a1df45f03 Showing diff from parent 88e7a6c9b120 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
48
49
50
51
52
53
54
55
56
57
58
59
60
61
 
48
49
50
 
 
 
 
 
 
 
 
51
52
53
@@ -48,14 +48,6 @@
  <?define ComponentMainExecutableGUID = {D648EC48-559C-4C66-A4CE-2D40A495DC5B} ?>   <?define ComponentWinExecutableGUID = {B4115B52-4FD3-478C-B605-D3F618287335} ?>   - <?define thgshellx86dll.guid = {728E8840-5878-4EA7-918F-281C2697ABB1} ?> - <?define thgshellx64dll.guid = {D5D1E532-CDAD-4FFD-9695-757B8A29B4BA} ?> - - <?define CmenuShellRegistrationX86.guid = {2BF442D0-EBD9-4B03-8F78-0F45C28F8AB5} ?> - <?define CmenuShellRegistrationX64.guid = {858CE519-8BA2-4E80-BBEB-591AE78384FA} ?> - - <?define OverlaysShellRegistrationX86.guid = {8505A107-D6B1-4EAF-9929-3D6E847B5FCB} ?> - <?define OverlaysShellRegistrationX64.guid = {9A678A1C-72D3-4713-AD8A-E7C08ED64DC9} ?>   <?define OverlayServerEXE.guid = {62C58746-BE5D-45F0-8AB7-2FE2AB9C57B0} ?>     <?define ExtensionVersions.guid = {4ADF436B-9B25-4D95-B6AC-88717F5A037A} ?>
Change 1 of 2 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
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
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
 
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
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
 
126
127
128
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
129
130
131
 
238
239
240
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
241
242
243
@@ -126,67 +126,6 @@
  />   </Component>   - <?if $(var.Platform) = "x64" ?> - <Component Id='thgshellx64dll' Guid='$(var.thgshellx64dll.guid)' Win64='yes'> - <File Id='thgshellx64dll' Name='ThgShellx64.dll' KeyPath='yes' - Source='../build-shellext/src/ThgShellx64.dll'/> - <RegistryValue - Root='HKLM' Key='$(var.ProgramRegKey)' - Type='string' Value='[INSTALLDIR]'/> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' - Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\InProcServer32' - Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/> - <?foreach CLSID in $(var.OverlayCLSIDList) ?> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32' - Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/> - <?endforeach?> - </Component> - <Component Id='CmenuShellRegistrationX64' Win64='yes' - Guid='$(var.CmenuShellRegistrationX64.guid)'> - <?include $(var.ShellextRepoFolder)/wix/shell-register-cmenu.wxi ?> - </Component> - <Component Id='OverlaysShellRegistrationX64' Win64='yes' - Guid='$(var.OverlaysShellRegistrationX64.guid)'> - <?include $(var.ShellextRepoFolder)/wix/shell-register-overlays.wxi ?> - </Component> - <?else?> - <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'> - <File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes' - Source='../build-shellext/src/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' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\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 $(var.ShellextRepoFolder)/wix/shell-register-cmenu.wxi ?> - </Component> - <Component Id='OverlaysShellRegistrationX86' - Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'> - <?include $(var.ShellextRepoFolder)/wix/shell-register-overlays.wxi ?> - </Component> - <?endif?> -   <Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'>   <File Id='COPYING' Name='COPYING.txt'   Source='COPYING.txt' @@ -299,44 +238,6 @@
  </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='../build-shellext/src/ThgShellx86.dll' - /> - <RegistryValue - Root='HKLM' Key='$(var.ProgramRegKey)' - Type='string' Value='[INSTALLDIR]' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' - Type='string' Value='[INSTALLDIRx86]ThgShellx86.dll' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\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 $(var.ShellextRepoFolder)/wix/shell-register-cmenu.wxi ?> - </Component> - <Component Id='OverlaysShellRegistrationX86' - Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'> - <?include $(var.ShellextRepoFolder)/wix/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'/>