Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset bfc61ebd3615…

Parents 797bc029d614…

Parents 36d1a5d63421…

by Adrian Buehlmann

Changes to 4 files · Browse files at bfc61ebd3615 Showing diff from parent 797bc029d614 36d1a5d63421 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​shell-register-cmenu.wxi Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
@@ -0,0 +1,52 @@
+<Include> + <!-- cmenu COM component --> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)' + Type='string' Value='TortoiseHg' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' + Type='string' Name='ThreadingModel' Value='Apartment' + /> + + <!-- cmenu registration --> + <RegistryValue + Root='HKCR' Key='Directory\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='Directory\Background\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='Drive\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='Folder\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='InternetShortcut\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='LibraryFolder\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + <RegistryValue + Root='HKCR' Key='*\shellex\ContextMenuHandlers\TortoiseHgCMenu' + Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' + /> + + <!-- Mark all as approved --> + <RegistryValue + Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Type='string' Name='$(var.CLSID_TortoiseHgCmenu)' Value='TortoiseHg' + /> + +</Include>
Change 1 of 1 Show Entire File contrib/​wix/​shell-register-overlays.wxi Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
@@ -0,0 +1,40 @@
+<Include> + <!-- overlay components --> + <?foreach CLSID in $(var.OverlayCLSIDList) ?> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID)' + Type='string' Value='TortoiseHg' + /> + <RegistryValue + Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32' + Type='string' Name='ThreadingModel' Value='Apartment' + /> + <?endforeach?> + + <!-- register overlay components with TortoiseOverlays --> + <RegistryValue + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Normal' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgNormal)' + /> + <RegistryValue + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Added' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgAdded)' + /> + <RegistryValue + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Modified' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgModified)' + /> + <RegistryValue + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Deleted' + Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgDeleted)' + /> + + <!-- Mark all as approved --> + <?foreach CLSID in $(var.OverlayCLSIDList) ?> + <RegistryValue + Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Type='string' Name='$(var.CLSID)' Value='TortoiseHg' + /> + <?endforeach?> + +</Include>
Change 1 of 1 Show Entire File contrib/​wix/​shell-register.wxi Stacked
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,87 +0,0 @@
-<Include> - <!-- cmenu COM component --> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)' - Type='string' Value='TortoiseHg' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' - Type='string' Name='ThreadingModel' Value='Apartment' - /> - <!-- overlay components --> - <?foreach CLSID in $(var.OverlayCLSIDList) ?> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID)' - Type='string' Value='TortoiseHg' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32' - Type='string' Name='ThreadingModel' Value='Apartment' - /> - <?endforeach?> - - <!-- cmenu registration --> - <RegistryValue - Root='HKCR' Key='Directory\shellex\ContextMenuHandlers\TortoiseHgCMenu' - Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' - /> - <RegistryValue - Root='HKCR' Key='Directory\Background\shellex\ContextMenuHandlers\TortoiseHgCMenu' - Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' - /> - <RegistryValue - Root='HKCR' Key='Drive\shellex\ContextMenuHandlers\TortoiseHgCMenu' - Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' - /> - <RegistryValue - Root='HKCR' Key='Folder\shellex\ContextMenuHandlers\TortoiseHgCMenu' - Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' - /> - <RegistryValue - Root='HKCR' Key='InternetShortcut\shellex\ContextMenuHandlers\TortoiseHgCMenu' - Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' - /> - <RegistryValue - Root='HKCR' Key='LibraryLocation\shellex\ContextMenuHandlers\TortoiseHgCMenu' - Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' - /> - <RegistryValue - Root='HKCR' Key='LibraryFolder\shellex\ContextMenuHandlers\TortoiseHgCMenu' - Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' - /> - <RegistryValue - Root='HKCR' Key='*\shellex\ContextMenuHandlers\TortoiseHgCMenu' - Type='string' Value='$(var.CLSID_TortoiseHgCmenu)' - /> - - <!-- register overlay components with TortoiseOverlays --> - <RegistryValue - Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Normal' - Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgNormal)' - /> - <RegistryValue - Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Added' - Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgAdded)' - /> - <RegistryValue - Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Modified' - Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgModified)' - /> - <RegistryValue - Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Deleted' - Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgDeleted)' - /> - - <!-- Mark all as approved --> - <RegistryValue - Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' - Type='string' Name='$(var.CLSID_TortoiseHgCmenu)' Value='TortoiseHg' - /> - <?foreach CLSID in $(var.OverlayCLSIDList) ?> - <RegistryValue - Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' - Type='string' Name='$(var.CLSID)' Value='TortoiseHg' - /> - <?endforeach?> - -</Include>
Change 1 of 4 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
148
149
150
151
 
 
 
 
 
 
 
 
 
 
152
153
154
 
286
287
288
289
290
 
 
 
 
 
 
 
 
 
 
 
291
292
293
 
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
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
343
344
345
 
425
426
427
428
429
430
 
 
 
 
 
 
 
 
 
431
432
433
 
148
149
150
 
151
152
153
154
155
156
157
158
159
160
161
162
163
 
295
296
297
 
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
 
334
335
336
 
 
337
338
339
 
340
341
 
 
 
 
 
 
 
 
 
 
 
342
 
 
 
 
 
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
 
451
452
453
 
 
 
454
455
456
457
458
459
460
461
462
463
464
465
@@ -148,7 +148,16 @@
  Type='string' Value='[INSTALLDIR]ThgShellx86.dll'   />   <?endforeach?> - <?include shell-register.wxi ?> + </Component> + <Component Id='CmenuShellRegistrationX86' + Guid='{287A355F-3DF6-4f55-9DD5-FABD09498B0C}' + > + <?include shell-register-cmenu.wxi ?> + </Component> + <Component Id='OverlaysShellRegistrationX86' + Guid='{5592F837-8C78-43f0-AD8D-2E2EA4B17E45}' + > + <?include shell-register-overlays.wxi ?>   </Component>   <Component Id='COPYING' Guid='382A8405-CB7B-42E8-8B9D-88B5C5283E73'>   <File Id='COPYING' Name='COPYING.txt' DiskId='1' @@ -286,8 +295,18 @@
  Type='string' Value='[Common64]ThgShellx64.dll'   />   <?endforeach?> - <?include shell-register.wxi ?>   </Component> + <Component Id='CmenuShellRegistrationX64' Win64='yes' + Guid='{46DF4532-7BFF-427a-BC59-F3B4D1022F56}' + > + <?include shell-register-cmenu.wxi ?> + </Component> + <Component Id='OverlaysShellRegistrationX64' Win64='yes' + Guid='{9B1300FC-3D05-4c82-991D-96277404C4BA}' + > + <?include shell-register-overlays.wxi ?> + </Component> +   </Directory>   </Directory>   <?endif?> @@ -315,31 +334,38 @@
  <MergeRef Id='VCRedist'/>   <MergeRef Id='VCRedistPolicy' />   </Feature> - <?if $(var.Platform) = "x86" ?> - <Feature Id='ShellExtension' Title='Shell Extension' + <?if $(var.Platform) = "x64" ?> + <Feature Id='ShellExtensionX64' Title='Shell Extension x64'   Level='1' AllowAdvertise='no' - Description='Overlay icons and context menu'> + Description='Context menu for 64-bit processes'>   <ComponentGroupRef Id='cmenuI18n' /> - <ComponentRef Id='thgtaskbarEXE' /> - <MergeRef Id='TortoiseOverlaysMergeX86' /> - <ComponentRef Id='thgshellx86dll' /> - </Feature> - <?elseif $(var.Platform) = "x64" ?> - <Feature Id='ShellExtension' Level='1' Display='expand' AllowAdvertise='no' - Title='Shell Extension x64' - Description='Overlay icons and context menu for 64 bit processes'> - <ComponentGroupRef Id='cmenuI18n' /> - <ComponentRef Id='thgtaskbarEXE' /> - <MergeRef Id='TortoiseOverlaysMergeX64' />   <ComponentRef Id='thgshellx64dll' /> - <Feature Id='ShellExtensionx86' Level='1' AllowAdvertise='no' - Title='Shell Extension x86' - Description='Overlay icons and context menu for 32 bit processes'> - <MergeRef Id='TortoiseOverlaysMergeX86' /> - <ComponentRef Id='thgshellx86dll' /> + <ComponentRef Id='CmenuShellRegistrationX64' /> + <Feature Id='OverlaysX64' Title='Overlay Icons' + Level='1' AllowAdvertise='no' + Description='Overlay icons for 64-bit processes' + > + <ComponentRef Id='thgtaskbarEXE' /> + <MergeRef Id='TortoiseOverlaysMergeX64' /> + <ComponentRef Id='OverlaysShellRegistrationX64' />   </Feature>   </Feature>   <?endif?> + <Feature Id='ShellExtensionX86' Title='Shell Extension x86' + Level='1' AllowAdvertise='no' + Description='Context menu for 32-bit processes'> + <ComponentGroupRef Id='cmenuI18n' /> + <ComponentRef Id='thgshellx86dll' /> + <ComponentRef Id='CmenuShellRegistrationX86' /> + <Feature Id='OverlaysX86' Title='Overlay Icons' + Level='1' AllowAdvertise='no' + Description='Overlay icons for 32-bit processes' + > + <ComponentRef Id='thgtaskbarEXE' /> + <MergeRef Id='TortoiseOverlaysMergeX86' /> + <ComponentRef Id='OverlaysShellRegistrationX86' /> + </Feature> + </Feature>   <Feature Id='Locales' Level='1'   Title='Translations'   Description='Mercurial and TortoiseHg Translations'> @@ -425,9 +451,15 @@
  <RemoveExistingProducts After="InstallValidate">   INSTALLEDTORTOISEHGPRODUCTS   </RemoveExistingProducts> - <Custom Action='StartThgtaskbarEXE' After='InstallFinalize'> - <![CDATA[&ShellExtension=3]]> - </Custom> + <?if $(var.Platform) = "x64" ?> + <Custom Action='StartThgtaskbarEXE' After='InstallFinalize'> + <![CDATA[&OverlaysX86=3 OR &OverlaysX64=3]]> + </Custom> + <?else?> + <Custom Action='StartThgtaskbarEXE' After='InstallFinalize'> + <![CDATA[&OverlaysX86=3]]> + </Custom> + <?endif?>   </InstallExecuteSequence>     <Upgrade Id='$(var.ProductUpgradeCode)'>