Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable wix: refactor shell-register.wxi using 'foreach'

Changeset af99d90781e8…

Parent 2a32e538ed55…

by Adrian Buehlmann

Changes to 2 files · Browse files at af99d90781e8 Showing diff from parent 2a32e538ed55 Diff from another changeset...

Change 1 of 3 Show Entire File contrib/​wix/​shell-register.wxi Stacked
 
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
 
81
82
83
84
 
85
86
87
88
 
89
90
91
92
 
93
94
95
96
 
97
98
99
 
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
 
 
 
 
 
 
 
121
 
8
9
10
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
11
12
13
14
15
16
17
18
19
20
21
22
23
24
 
56
57
58
 
59
60
61
62
 
63
64
65
66
 
67
68
69
70
 
71
72
73
74
 
77
78
79
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
80
81
82
83
84
85
86
87
@@ -8,42 +8,17 @@
  Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32'   Type='string' Name='ThreadingModel' Value='Apartment'   /> - <!-- Normal overlay COM component --> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)' - Type='string' Value='TortoiseHg' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgNormal)\InProcServer32' - Type='string' Name='ThreadingModel' Value='Apartment' - /> - <!-- Added overlay COM component --> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)' - Type='string' Value='TortoiseHg' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgAdded)\InProcServer32' - Type='string' Name='ThreadingModel' Value='Apartment' - /> - <!-- Modified overlay COM component --> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)' - Type='string' Value='TortoiseHg' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgModified)\InProcServer32' - Type='string' Name='ThreadingModel' Value='Apartment' - /> - <!-- Unversioned overlay COM component --> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)' - Type='string' Value='TortoiseHg' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgUnversioned)\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 @@ -81,19 +56,19 @@
    <!-- register overlay components with TortoiseOverlays -->   <RegistryValue - Root='HKLM' Key='Software\TortoiseOverlays\Normal' + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Normal'   Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgNormal)'   />   <RegistryValue - Root='HKLM' Key='Software\TortoiseOverlays\Added' + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Added'   Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgAdded)'   />   <RegistryValue - Root='HKLM' Key='Software\TortoiseOverlays\Modified' + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Modified'   Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgModified)'   />   <RegistryValue - Root='HKLM' Key='Software\TortoiseOverlays\Unversioned' + Root='HKLM' Key='$(var.TOverlaysRegistryKey)\Unversioned'   Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgUnversioned)'   />   @@ -102,20 +77,11 @@
  Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved'   Type='string' Name='$(var.CLSID_TortoiseHgCmenu)' Value='TortoiseHg'   /> - <RegistryValue - Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' - Type='string' Name='$(var.CLSID_TortoiseHgNormal)' Value='TortoiseHg' - /> - <RegistryValue - Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' - Type='string' Name='$(var.CLSID_TortoiseHgAdded)' Value='TortoiseHg' - /> - <RegistryValue - Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' - Type='string' Name='$(var.CLSID_TortoiseHgModified)' Value='TortoiseHg' - /> - <RegistryValue - Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' - Type='string' Name='$(var.CLSID_TortoiseHgUnversioned)' 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 1 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
20
21
22
 
 
23
24
25
26
27
 
 
 
 
28
29
30
 
20
21
22
23
24
25
26
27
28
 
29
30
31
32
33
34
35
@@ -20,11 +20,16 @@
  <?define TOverlaysSrcFilenameX86 = TortoiseOverlays-$(var.TOverlaysVersion)-win32.msm ?>   <?define TOverlaysSrcFilenameX64 = TortoiseOverlays-$(var.TOverlaysVersion)-x64.msm ?>   + <?define TOverlaysRegistryKey = Software\TortoiseOverlays ?> +   <?define VCRedistSrcDir = C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC ?>     <!-- shell extension CLSID's -->   <?include ../../win32/shellext/ThgCLSIDs.wxi ?> - + <?define OverlayCLSIDList = + $(var.CLSID_TortoiseHgNormal);$(var.CLSID_TortoiseHgAdded);$(var.CLSID_TortoiseHgModified);$(var.CLSID_TortoiseHgUnversioned) + ?> +   <Product Name='TortoiseHg $(var.Version) ($(var.Platform))'   Id='$(var.ProductId)'   Version='$(var.Version)'