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

wix: move thg component GUIDs into new thg-guids.wxi

Changeset 9f2a25e3d425…

Parent b00a9872f14f…

by Adrian Buehlmann

Changes to 4 files · Browse files at 9f2a25e3d425 Showing diff from parent b00a9872f14f Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​cmenu-i18n.wxs Stacked
 
1
2
3
 
 
4
5
6
7
8
9
10
 
11
12
13
 
1
2
3
4
5
6
7
8
9
10
11
 
12
13
14
15
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   + <?include thg-guids.wxi ?> +   <?define thgcmenulangs = cs;da;de;en_GB;en_US;es;fa;fr;he;hr;it;ja;ko;nl;nn;pl;pt;pt_BR;ru;tr;uk;zh_CN;zh_TW ?>   <!-- lang 'ca' is used for key path -->     <Fragment>   <DirectoryRef Id="i18ndir">   <Directory Id="cmenuI18n" Name="cmenu"> - <Component Id="cmenuI18n" Guid="{B0AB4947-248C-4c6b-841C-49284EF99022}"> + <Component Id="cmenuI18n" Guid="$(var.cmenuI18n.guid)">   <File Source="$(var.SourceDir)\thg-cmenu-ca.reg" KeyPath="yes"/>   <?foreach LANG in $(var.thgcmenulangs) ?>   <File Source="$(var.SourceDir)\thg-cmenu-$(var.LANG).reg" />
Change 1 of 1 Show Entire File contrib/​wix/​thg-guids.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
@@ -0,0 +1,43 @@
+<Include> + + <!-- cmenu-i18n.wxs --> + <?define cmenuI18n.guid = {B0AB4947-248C-4c6b-841C-49284EF99022} ?> + + <!-- thg-i18n.wxs --> + <?define thgI18nFolder.guid = {69E6E182-BCD2-4b03-A941-7B9A054DF7AF} ?> + + <!-- tortoisehg.wxs --> + <?define ProductUpgradeCode = {838657CF-C9EC-452D-800D-0E70FC021D0A} ?> + + <?define ComponentMainExecutableGUID = {5A98EB92-2C82-406E-81A5-1161CA87ED8E} ?> + + <?define thgshellx86dll.guid = {1126CF42-3994-428B-A746-464E1BC680F3} ?> + <?define thgshellx64dll.guid = {59FD2A49-BA62-40CC-B155-D11DB11EE611} ?> + + <?define CmenuShellRegistrationX86.guid = {287A355F-3DF6-4f55-9DD5-FABD09498B0C} ?> + <?define CmenuShellRegistrationX64.guid = {46DF4532-7BFF-427a-BC59-F3B4D1022F56} ?> + + <?define OverlaysShellRegistrationX86.guid = {5592F837-8C78-43f0-AD8D-2E2EA4B17E45} ?> + <?define OverlaysShellRegistrationX64.guid = {9B1300FC-3D05-4c82-991D-96277404C4BA} ?> + <?define OverlayServerEXE.guid = {DC5D9CC4-8330-4146-99EC-30D3AA255DD4} ?> + + <?define ExtensionVersions.guid = {1996AB0D-634D-4DC8-9581-326151F38B11} ?> + <?define COPYING.guid = {382A8405-CB7B-42E8-8B9D-88B5C5283E73} ?> + + <?define docdiffEXE.guid = {4BA6389A-6A0B-483B-A3FE-86EE436FDD31} ?> + <?define KDiff3EXE.guid = {B2A5EFD4-A385-45E0-8467-46B955979672} ?> + <?define TortoisePlinkEXE.guid = {A18BFE4D-BED0-4EF9-97CC-5B4326E3CD2F} ?> + <?define PageantEXE.guid = {EA7EF381-076C-47CE-8F51-355DB7F86D1A} ?> + + <?define chmFile.guid = {A26038DC-C686-4296-9335-FA4B9ABC769C} ?> + <?define pdfFile.guid = {1C5792DA-C48F-4F7F-9CD8-FC467995B8E4} ?> + <?define hgbook.guid = {A5F6D094-BCFD-4AC0-8675-7DF8CC94FEE5} ?> + + <?define mercurial.rc.guid = {28ACE5D7-FFCE-488E-A94A-8F13A21DD25D} ?> + <?define mergetools.rc.guid = {30CC047C-48B4-4D91-B8EC-79975327A9C7} ?> + <?define mergepatterns.rc.guid = {05860DA7-8391-43A4-A4E7-6E9E084D11C6} ?> + + <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?> + <?define ThgAppData.guid = {94B8FBB5-4AE3-4960-B3D8-94BEFC6366E9} ?> + +</Include>
Change 1 of 1 Show Entire File contrib/​wix/​thg-i18n.wxs Stacked
 
1
2
3
 
 
4
5
6
7
8
9
10
 
11
12
13
 
1
2
3
4
5
6
7
8
9
10
11
 
12
13
14
15
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   + <?include thg-guids.wxi ?> +   <?define thg_po_langs = cs;da;de;en_GB;es;fa;fr;he;hr;hu;it;ja;ko;nl;nn;oc;pl;pt;pt_BR;ru;sv;tr;uk;zh_CN;zh_TW ?>   <!-- lang 'ca' is used for key path -->     <Fragment>   <DirectoryRef Id="i18ndir">   <Directory Id="thgI18nFolder" Name="tortoisehg"> - <Component Id="thgI18nFolder" Guid="{69E6E182-BCD2-4b03-A941-7B9A054DF7AF}"> + <Component Id="thgI18nFolder" Guid="$(var.thgI18nFolder.guid)">   <File Id="thg.ca.po" Source="$(var.SourceDir)\tortoisehg\ca.po" KeyPath="yes" />   <?foreach LANG in $(var.thg_po_langs) ?>   <File Id="thg.$(var.LANG).po" Source="$(var.SourceDir)\tortoisehg\$(var.LANG).po" />
Change 1 of 11 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
6
7
8
9
10
 
11
12
13
 
105
106
107
108
 
109
110
111
112
113
114
 
115
116
117
 
126
127
128
129
 
130
131
132
 
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
 
190
191
192
193
 
194
195
196
 
199
200
201
202
 
203
204
205
 
211
212
213
214
 
215
216
217
218
219
 
220
221
222
223
224
 
225
226
227
 
233
234
235
236
 
237
238
239
 
251
252
253
254
 
255
256
257
 
273
274
275
276
 
277
278
279
 
293
294
295
296
 
297
298
299
300
301
 
302
303
304
 
6
7
8
 
 
9
10
11
12
 
104
105
106
 
107
108
109
110
111
112
 
113
114
115
116
 
125
126
127
 
128
129
130
131
 
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
 
189
190
191
 
192
193
194
195
 
198
199
200
 
201
202
203
204
 
210
211
212
 
213
214
215
216
217
 
218
219
220
221
222
 
223
224
225
226
 
232
233
234
 
235
236
237
238
 
250
251
252
 
253
254
255
256
 
272
273
274
 
275
276
277
278
 
292
293
294
 
295
296
297
298
299
 
300
301
302
303
@@ -6,8 +6,7 @@
  This software may be used and distributed according to the terms of the   GNU General Public License version 2 or any later version. -->   - <?define ComponentMainExecutableGUID = 5A98EB92-2C82-406E-81A5-1161CA87ED8E ?> - <?define ProductUpgradeCode = 838657CF-C9EC-452D-800D-0E70FC021D0A ?> + <?include thg-guids.wxi ?>     <?if $(var.Platform) = "x64" ?>   <?define IsX64 = yes ?> @@ -105,13 +104,13 @@
  Permanent="no" Value="[INSTALLDIR]" Action="set"   />   </Component> - <Component Id='ExtensionVersions' Guid='1996AB0D-634D-4DC8-9581-326151F38B11'> + <Component Id='ExtensionVersions' Guid='$(var.ExtensionVersions.guid)'>   <File Id='ExtensionVersions' Name='extension-versions.txt'   KeyPath='yes'   Source='..\extension-versions.txt'   />   </Component> - <Component Id='OverlayServerEXE' Guid='DC5D9CC4-8330-4146-99EC-30D3AA255DD4'> + <Component Id='OverlayServerEXE' Guid='$(var.OverlayServerEXE.guid)'>   <File Id='OverlayServerEXE' Name='TortoiseHgOverlayServer.exe'   KeyPath='yes'   Source='dist\TortoiseHgOverlayServer.exe' > @@ -126,7 +125,7 @@
  Type='string' Value='[INSTALLDIR]TortoiseHgOverlayServer.exe'   />   </Component> - <Component Id='thgshellx86dll' Guid='1126CF42-3994-428B-A746-464E1BC680F3'> + <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)'>   <File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes'   Source='win32\ThgShellx86.dll'   /> @@ -146,42 +145,42 @@
  <?endforeach?>   </Component>   <Component Id='CmenuShellRegistrationX86' - Guid='{287A355F-3DF6-4f55-9DD5-FABD09498B0C}' + Guid='$(var.CmenuShellRegistrationX86.guid)'   >   <?include shell-register-cmenu.wxi ?>   </Component>   <Component Id='OverlaysShellRegistrationX86' - Guid='{5592F837-8C78-43f0-AD8D-2E2EA4B17E45}' + Guid='$(var.OverlaysShellRegistrationX86.guid)'   >   <?include shell-register-overlays.wxi ?>   </Component> - <Component Id='COPYING' Guid='382A8405-CB7B-42E8-8B9D-88B5C5283E73'> + <Component Id='COPYING' Guid='$(var.COPYING.guid)'>   <File Id='COPYING' Name='COPYING.txt'   Source='COPYING.txt'   />   </Component> - <Component Id='docdiffEXE' Guid='4BA6389A-6A0B-483B-A3FE-86EE436FDD31'> + <Component Id='docdiffEXE' Guid='$(var.docdiffEXE.guid)'>   <File Id='docdiffEXE' Name='docdiff.exe' KeyPath='yes'   Source='dist\docdiff.exe'   />   </Component> - <Component Id='KDiff3EXE' Guid='B2A5EFD4-A385-45E0-8467-46B955979672'> + <Component Id='KDiff3EXE' Guid='$(var.KDiff3EXE.guid)'>   <File Id='KDiff3EXE' Name='kdiff3.exe' KeyPath='yes'   Source='..\contrib\kdiff3.exe'   />   </Component> - <Component Id='TortoisePlinkEXE' Guid='A18BFE4D-BED0-4EF9-97CC-5B4326E3CD2F'> + <Component Id='TortoisePlinkEXE' Guid='$(var.TortoisePlinkEXE.guid)'>   <File Id='TortoisePlinkEXE' Name='TortoisePlink.exe' KeyPath='yes'   Source='..\contrib\TortoisePlink.exe'   />   </Component> - <Component Id='PageantEXE' Guid='EA7EF381-076C-47CE-8F51-355DB7F86D1A'> + <Component Id='PageantEXE' Guid='$(var.PageantEXE.guid)'>   <File Id='PageantEXE' Name='Pageant.exe' KeyPath='yes'   Source='..\contrib\Pageant.exe'   />   </Component>   <Directory Id='docFolder' Name='doc'> - <Component Id='chmFile' Guid='A26038DC-C686-4296-9335-FA4B9ABC769C'> + <Component Id='chmFile' Guid='$(var.chmFile.guid)'>   <File Id='chmFile' Name='TortoiseHg.chm' KeyPath='yes'   Source='doc\build\chm\TortoiseHg.chm' >   <Shortcut Id="chmStartMenu" Directory="ProgramMenuDir" @@ -190,7 +189,7 @@
  />   </File>   </Component> - <Component Id='pdfFile' Guid='1C5792DA-C48F-4F7F-9CD8-FC467995B8E4'> + <Component Id='pdfFile' Guid='$(var.pdfFile.guid)'>   <File Id='pdfFile' Name='TortoiseHg.pdf' KeyPath='yes'   Source='doc\build\pdf\TortoiseHg.pdf'>   <Shortcut Id="pdfStartMenu" Directory="ProgramMenuDir" @@ -199,7 +198,7 @@
  />   </File>   </Component> - <Component Id='hgbook' Guid='A5F6D094-BCFD-4AC0-8675-7DF8CC94FEE5'> + <Component Id='hgbook' Guid='$(var.hgbook.guid)'>   <File Id='hgbook' Name='hgbook.pdf' KeyPath='yes'   Source='..\misc\hgbook.pdf'>   <Shortcut Id="hgbookStartMenu" Directory="ProgramMenuDir" @@ -211,17 +210,17 @@
  </Directory>     <Directory Id='HGRCD' Name='hgrc.d'> - <Component Id='mercurial.rc' Guid='28ACE5D7-FFCE-488E-A94A-8F13A21DD25D'> + <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)'>   <File Id='mercurial.rc' Name='Mercurial.rc' ReadOnly='yes'   Source='contrib\win32\mercurial.rc'   />   </Component> - <Component Id='mergetools.rc' Guid='30CC047C-48B4-4D91-B8EC-79975327A9C7'> + <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)'>   <File Id='mergetools.rc' Name='MergeTools.rc' ReadOnly='yes'   Source='contrib\mergetools.rc'   />   </Component> - <Component Id="mergepatterns.rc" Guid="05860DA7-8391-43A4-A4E7-6E9E084D11C6"> + <Component Id="mergepatterns.rc" Guid='$(var.mergepatterns.rc.guid)'>   <File Id='mergepatterns.rc' Name='MergePatterns.rc'   ReadOnly='yes' KeyPath='yes'   Source='contrib\win32\mergepatterns.rc' @@ -233,7 +232,7 @@
    <Directory Id="ProgramMenuFolder" Name="Programs">   <Directory Id="ProgramMenuDir" Name="TortoiseHg $(var.Version)"> - <Component Id="ProgramMenuDir" Guid="D5A63320-1238-489B-B68B-CF053E9577CA"> + <Component Id="ProgramMenuDir" Guid="$(var.ProgramMenuDir.guid)">   <RemoveFolder Id='ProgramMenuDir' On='uninstall' />   <RegistryValue   Root='HKCU' Key='$(var.ProgramRegKey)' @@ -251,7 +250,7 @@
    <!-- Directory Id="AppDataFolder" Name="AppData">   <Directory Id="ThgAppData" Name="TortoiseHg"> - <Component Id="ThgAppData" Guid="94B8FBB5-4AE3-4960-B3D8-94BEFC6366E9"> + <Component Id="ThgAppData" Guid="$(var.ThgAppData.guid)">   <RemoveFolder Id='ThgAppData' On='uninstall' />   <RegistryValue Root='HKCU' Key='Software\TortoiseHg\AppData' KeyPath='yes' />   </Component> @@ -273,7 +272,7 @@
  />   <Directory Id="CommonFiles64Folder" Name="Programs64" >   <Directory Id="Common64" Name="TortoiseHg" > - <Component Id='thgshellx64dll' Guid='59FD2A49-BA62-40CC-B155-D11DB11EE611' Win64='yes'> + <Component Id='thgshellx64dll' Guid='$(var.thgshellx64dll.guid)' Win64='yes'>   <File Id='thgshellx64dll' Name='ThgShellx64.dll' KeyPath='yes'   Source='win32\ThgShellx64.dll'   /> @@ -293,12 +292,12 @@
  <?endforeach?>   </Component>   <Component Id='CmenuShellRegistrationX64' Win64='yes' - Guid='{46DF4532-7BFF-427a-BC59-F3B4D1022F56}' + Guid='$(var.CmenuShellRegistrationX64.guid)'   >   <?include shell-register-cmenu.wxi ?>   </Component>   <Component Id='OverlaysShellRegistrationX64' Win64='yes' - Guid='{9B1300FC-3D05-4c82-991D-96277404C4BA}' + Guid='$(var.OverlaysShellRegistrationX64.guid)'   >   <?include shell-register-overlays.wxi ?>   </Component>