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

wix: create x64 native package

It looks like the two blockers to an x64 native installer are svn SWIG bundings
and an x64 native kdiff3

Changeset c5991703c777…

Parent baa4c2ec54bb…

by Steve Borho

Changes to 13 files · Browse files at c5991703c777 Showing diff from parent baa4c2ec54bb Diff from another changeset...

Change 1 of 2 Show Entire File win32/​wix/​cmenu-i18n.wxs Stacked
 
2
3
4
 
5
6
7
 
11
12
13
14
 
15
16
17
 
2
3
4
5
6
7
8
 
12
13
14
 
15
16
17
18
@@ -2,6 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?> + <?include defines.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 @@ -11,7 +12,7 @@
  <Fragment>   <DirectoryRef Id="i18ndir">   <Directory Id="cmenuI18n" Name="cmenu" FileSource="$(var.SourceDir)"> - <Component Id="cmenuI18n" Guid="$(var.cmenuI18n.guid)"> + <Component Id="cmenuI18n" Guid="$(var.cmenuI18n.guid)" Win64='$(var.IsX64)'>   <File Name="thg-cmenu-ca.reg" KeyPath="yes"/>   <?foreach LANG in $(var.thgcmenulangs) ?>   <File Name="thg-cmenu-$(var.LANG).reg" />
Change 1 of 3 Show Entire File win32/​wix/​contrib.wxs Stacked
 
2
3
4
 
5
6
7
 
13
14
15
16
 
17
18
19
 
27
28
29
30
 
31
32
33
 
2
3
4
5
6
7
8
 
14
15
16
 
17
18
19
20
 
28
29
30
 
31
32
33
34
@@ -2,6 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?> + <?include defines.wxi ?>     <Fragment>   <ComponentGroup Id="contribFolder"> @@ -13,7 +14,7 @@
  <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="contribdir" Name="contrib" FileSource="$(var.SourceDir)"> - <Component Id="contrib" Guid="$(var.contrib.guid)"> + <Component Id="contrib" Guid="$(var.contrib.guid)" Win64='$(var.IsX64)'>   <File Name="bash_completion" KeyPath="yes" />   <File Name="hgk" />   <File Name="hgweb.fcgi" /> @@ -27,7 +28,7 @@
  <File Name="zsh_completion" />   </Component>   <Directory Id="vimdir" Name="vim"> - <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)"> + <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)" Win64='$(var.IsX64)'>   <File Name="hg-menu.vim" KeyPath="yes" />   <File Name="HGAnnotate.vim" />   <File Name="hgcommand.vim" />
Change 1 of 1 Show Entire File win32/​wix/​defines.wxi Stacked
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
@@ -0,0 +1,9 @@
+<Include> + + <?if $(var.Platform) = "x64" ?> + <?define IsX64 = yes ?> + <?else?> + <?define IsX64 = no ?> + <?endif?> + +</Include>
Change 1 of 3 Show Entire File win32/​wix/​dist.wxs Stacked
 
2
3
4
 
5
6
7
8
 
9
10
11
 
33
34
35
36
37
38
39
 
56
57
58
59
 
60
61
62
 
2
3
4
5
6
7
8
 
9
10
11
12
 
34
35
36
 
37
38
39
 
56
57
58
 
59
60
61
62
@@ -2,10 +2,11 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?> + <?include defines.wxi ?>     <Fragment>   <DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)"> - <Component Id="distOutput" Guid="$(var.dist.guid)"> + <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'>   <File Name="library.zip" KeyPath="yes" />   <File Name="hg.exe" />   <File Name="mercurial.base85.pyd" /> @@ -33,7 +34,6 @@
  <File Name="win32api.pyd" />   <File Name="win32com.shell.shell.pyd" />   <File Name="win32console.pyd" /> - <File Name="win32cred.pyd" />   <File Name="win32event.pyd" />   <File Name="win32file.pyd" />   <File Name="win32gui.pyd" /> @@ -56,7 +56,7 @@
  <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="imgFmtDir" Name="imageformats" FileSource="$(var.SourceDir)/imageformats"> - <Component Id="imageFormats" Guid="$(var.imageformats.guid)"> + <Component Id="imageFormats" Guid="$(var.imageformats.guid)" Win64='$(var.IsX64)'>   <File Name="qico4.dll" KeyPath="yes" />   <File Name="qsvg4.dll" />   </Component>
Change 1 of 5 Show Entire File win32/​wix/​doc.wxs Stacked
 
2
3
4
 
5
6
7
 
15
16
17
18
 
19
20
21
 
23
24
25
26
 
27
28
29
 
31
32
33
34
 
35
36
37
 
39
40
41
42
 
43
44
45
 
2
3
4
5
6
7
8
 
16
17
18
 
19
20
21
22
 
24
25
26
 
27
28
29
30
 
32
33
34
 
35
36
37
38
 
40
41
42
 
43
44
45
46
@@ -2,6 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?> + <?include defines.wxi ?>     <Fragment>   <ComponentGroup Id="docFolder"> @@ -15,7 +16,7 @@
  <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)"> - <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)"> + <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)" Win64='$(var.IsX64)'>   <File Name="hg.1.html" KeyPath="yes">   <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir"   Name="Mercurial Command Reference" @@ -23,7 +24,7 @@
  />   </File>   </Component> - <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)"> + <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)" Win64='$(var.IsX64)'>   <File Name="hgignore.5.html" KeyPath="yes">   <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir"   Name="Mercurial Ignore Files" @@ -31,7 +32,7 @@
  />   </File>   </Component> - <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)"> + <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)" Win64='$(var.IsX64)'>   <File Name="hgrc.5.html" KeyPath="yes">   <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir"   Name="Mercurial Configuration Files" @@ -39,7 +40,7 @@
  />   </File>   </Component> - <Component Id="doc.style.css" Guid="$(var.doc.style.css)"> + <Component Id="doc.style.css" Guid="$(var.doc.style.css)" Win64='$(var.IsX64)'>   <File Name="style.css" KeyPath="yes" />   </Component>   </Directory>
Change 1 of 1 Show Entire File win32/​wix/​help.wxs Stacked
 
2
3
4
 
5
6
7
8
9
 
10
11
12
 
2
3
4
5
6
7
8
9
 
10
11
12
13
@@ -2,11 +2,12 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?> + <?include defines.wxi ?>     <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)"> - <Component Id="helpFolder" Guid="$(var.helpFolder.guid)"> + <Component Id="helpFolder" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'>   <File Name="config.txt" KeyPath="yes" />   <File Name="dates.txt" />   <File Name="diffs.txt" />
Change 1 of 2 Show Entire File win32/​wix/​i18n.wxs Stacked
 
2
3
4
 
5
6
7
 
10
11
12
13
 
14
15
16
 
2
3
4
5
6
7
8
 
11
12
13
 
14
15
16
17
@@ -2,6 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?> + <?include defines.wxi ?>     <?define hg_po_langs =   da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW @@ -10,7 +11,7 @@
  <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="i18ndir" Name="i18n" FileSource="$(var.SourceDir)"> - <Component Id="i18nFolder" Guid="$(var.i18nFolder.guid)"> + <Component Id="i18nFolder" Guid="$(var.i18nFolder.guid)" Win64='$(var.IsX64)'>   <File Name="hggettext" KeyPath="yes" />   <?foreach LANG in $(var.hg_po_langs) ?>   <File Id="hg.$(var.LANG).po"
Change 1 of 1 Show Entire File win32/​wix/​icons.wxs Stacked
 
2
3
4
 
5
6
7
8
9
10
11
 
12
13
14
 
2
3
4
5
6
7
8
9
10
11
 
12
13
14
15
@@ -2,13 +2,14 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?> + <?include defines.wxi ?>     <Fragment>   <DirectoryRef Id="INSTALLDIR">     <Directory Id="IconsDirectory" Name="icons" FileSource="$(var.SourceDir)">   - <Component Id='Icons' Guid='$(var.Icons.guid)'> + <Component Id='Icons' Guid='$(var.Icons.guid)' Win64='$(var.IsX64)'>   <File Name="branch.ico" KeyPath="yes" />   <File Name="detect_rename.ico" />   <File Name="fileadd.ico" />
Change 1 of 2 Show Entire File win32/​wix/​locale.wxs Stacked
 
1
2
3
 
 
4
5
6
 
19
20
21
22
 
23
24
25
 
1
2
3
4
5
6
7
8
 
21
22
23
 
24
25
26
27
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   + <?include defines.wxi ?> +   <?define hglocales =   da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW   ?> @@ -19,7 +21,7 @@
  <?foreach LOC in $(var.hglocales) ?>   <Directory Id="hg.locale.$(var.LOC)" Name="$(var.LOC)">   <Directory Id="hg.locale.$(var.LOC).LC_MESSAGES" Name="LC_MESSAGES"> - <Component Id="hg.locale.$(var.LOC)" Guid="*"> + <Component Id="hg.locale.$(var.LOC)" Guid="*" Win64='$(var.IsX64)'>   <File Id="hg.mo.$(var.LOC)" Name="hg.mo" KeyPath="yes" />   </Component>   </Directory>
Change 1 of 10 Show Entire File win32/​wix/​templates.wxs Stacked
 
2
3
4
 
5
6
7
 
26
27
28
29
 
30
31
32
 
35
36
37
38
 
39
40
41
 
48
49
50
51
 
52
53
54
55
56
57
58
 
59
60
61
 
82
83
84
85
 
86
87
88
 
109
110
111
112
 
113
114
115
 
135
136
137
138
 
139
140
141
 
148
149
150
151
 
152
153
154
 
162
163
164
165
 
166
167
168
 
188
189
190
191
 
192
193
194
 
2
3
4
5
6
7
8
 
27
28
29
 
30
31
32
33
 
36
37
38
 
39
40
41
42
 
49
50
51
 
52
53
54
55
56
57
58
 
59
60
61
62
 
83
84
85
 
86
87
88
89
 
110
111
112
 
113
114
115
116
 
136
137
138
 
139
140
141
142
 
149
150
151
 
152
153
154
155
 
163
164
165
 
166
167
168
169
 
189
190
191
 
192
193
194
195
@@ -2,6 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?> + <?include defines.wxi ?>     <Fragment>   <ComponentGroup Id="templatesFolder"> @@ -26,7 +27,7 @@
    <Directory Id="templatesdir" Name="templates" FileSource="$(var.SourceDir)">   - <Component Id="templates.root" Guid="$(var.templates.root.guid)"> + <Component Id="templates.root" Guid="$(var.templates.root.guid)" Win64='$(var.IsX64)'>   <File Name="map-cmdline.changelog" KeyPath="yes" />   <File Name="map-cmdline.compact" />   <File Name="map-cmdline.default" /> @@ -35,7 +36,7 @@
  </Component>     <Directory Id="templates.atomdir" Name="atom"> - <Component Id="templates.atom" Guid="$(var.templates.atom.guid)"> + <Component Id="templates.atom" Guid="$(var.templates.atom.guid)" Win64='$(var.IsX64)'>   <File Id="atom.changelog.tmpl" Name="changelog.tmpl" KeyPath="yes" />   <File Id="atom.changelogentry.tmpl" Name="changelogentry.tmpl" />   <File Id="atom.error.tmpl" Name="error.tmpl" /> @@ -48,14 +49,14 @@
  </Directory>     <Directory Id="templates.coaldir" Name="coal"> - <Component Id="templates.coal" Guid="$(var.templates.coal.guid)"> + <Component Id="templates.coal" Guid="$(var.templates.coal.guid)" Win64='$(var.IsX64)'>   <File Id="coal.header.tmpl" Name="header.tmpl" KeyPath="yes" />   <File Id="coal.map" Name="map" />   </Component>   </Directory>     <Directory Id="templates.gitwebdir" Name="gitweb"> - <Component Id="templates.gitweb" Guid="$(var.templates.gitweb.guid)"> + <Component Id="templates.gitweb" Guid="$(var.templates.gitweb.guid)" Win64='$(var.IsX64)'>   <File Id="gitweb.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />   <File Id="gitweb.changelog.tmpl" Name="changelog.tmpl" />   <File Id="gitweb.changelogentry.tmpl" Name="changelogentry.tmpl" /> @@ -82,7 +83,7 @@
  </Directory>     <Directory Id="templates.monobluedir" Name="monoblue"> - <Component Id="templates.monoblue" Guid="$(var.templates.monoblue.guid)"> + <Component Id="templates.monoblue" Guid="$(var.templates.monoblue.guid)" Win64='$(var.IsX64)'>   <File Id="monoblue.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />   <File Id="monoblue.changelog.tmpl" Name="changelog.tmpl" />   <File Id="monoblue.changelogentry.tmpl" Name="changelogentry.tmpl" /> @@ -109,7 +110,7 @@
  </Directory>     <Directory Id="templates.paperdir" Name="paper"> - <Component Id="templates.paper" Guid="$(var.templates.paper.guid)"> + <Component Id="templates.paper" Guid="$(var.templates.paper.guid)" Win64='$(var.IsX64)'>   <File Id="paper.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />   <File Id="paper.changeset.tmpl" Name="changeset.tmpl" />   <File Id="paper.error.tmpl" Name="error.tmpl" /> @@ -135,7 +136,7 @@
  </Directory>     <Directory Id="templates.rawdir" Name="raw"> - <Component Id="templates.raw" Guid="$(var.templates.raw.guid)"> + <Component Id="templates.raw" Guid="$(var.templates.raw.guid)" Win64='$(var.IsX64)'>   <File Id="raw.changeset.tmpl" Name="changeset.tmpl" KeyPath="yes" />   <File Id="raw.error.tmpl" Name="error.tmpl" />   <File Id="raw.fileannotate.tmpl" Name="fileannotate.tmpl" /> @@ -148,7 +149,7 @@
  </Directory>     <Directory Id="templates.rssdir" Name="rss"> - <Component Id="templates.rss" Guid="$(var.templates.rss.guid)"> + <Component Id="templates.rss" Guid="$(var.templates.rss.guid)" Win64='$(var.IsX64)'>   <File Id="rss.changelog.tmpl" Name="changelog.tmpl" KeyPath="yes" />   <File Id="rss.changelogentry.tmpl" Name="changelogentry.tmpl" />   <File Id="rss.error.tmpl" Name="error.tmpl" /> @@ -162,7 +163,7 @@
  </Directory>     <Directory Id="templates.spartandir" Name="spartan"> - <Component Id="templates.spartan" Guid="$(var.templates.spartan.guid)"> + <Component Id="templates.spartan" Guid="$(var.templates.spartan.guid)" Win64='$(var.IsX64)'>   <File Id="spartan.branches.tmpl" Name="branches.tmpl" KeyPath="yes" />   <File Id="spartan.changelog.tmpl" Name="changelog.tmpl" />   <File Id="spartan.changelogentry.tmpl" Name="changelogentry.tmpl" /> @@ -188,7 +189,7 @@
  </Directory>     <Directory Id="templates.staticdir" Name="static"> - <Component Id="templates.static" Guid="$(var.templates.static.guid)"> + <Component Id="templates.static" Guid="$(var.templates.static.guid)" Win64='$(var.IsX64)'>   <File Id="static.background.png" Name="background.png" KeyPath="yes" />   <File Id="static.coal.file.png" Name="coal-file.png" />   <File Id="static.coal.folder.png" Name="coal-folder.png" />
Change 1 of 2 Show Entire File win32/​wix/​thg-i18n.wxs Stacked
 
2
3
4
 
5
6
7
 
11
12
13
14
 
15
16
17
 
2
3
4
5
6
7
8
 
12
13
14
 
15
16
17
18
@@ -2,6 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">     <?include guids.wxi ?> + <?include defines.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 @@ -11,7 +12,7 @@
  <Fragment>   <DirectoryRef Id="i18ndir" FileSource="$(var.SourceDir)">   <Directory Id="thgI18nFolder" Name="tortoisehg"> - <Component Id="thgI18nFolder" Guid="$(var.thgI18nFolder.guid)"> + <Component Id="thgI18nFolder" Guid="$(var.thgI18nFolder.guid)" Win64='$(var.IsX64)'>   <File Id="thg.ca.po" Name="ca.po" KeyPath="yes" />   <?foreach LANG in $(var.thg_po_langs) ?>   <File Id="thg.$(var.LANG).po" Name="$(var.LANG).po" />
Change 1 of 2 Show Entire File win32/​wix/​thg-locale.wxs Stacked
 
1
2
3
 
 
4
5
6
 
18
19
20
21
 
22
23
24
 
1
2
3
4
5
6
7
8
 
20
21
22
 
23
24
25
26
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   + <?include defines.wxi ?> +   <?define thglocales =   ca;cs;da;de;en_GB;es;fa;fr;he;hr;hu;it;ja;nl;nn;pl;pt;pt_BR;ru;sv;tr;uk;zh_CN;zh_TW   ?> @@ -18,7 +20,7 @@
  <DirectoryRef Id="localedir" FileSource="$(var.SourceDir)">   <Directory Id="thg.locale.$(var.LOC)" Name="$(var.LOC)">   <Directory Id="thg.locale.$(var.LOC).LC_MESSAGES" Name="LC_MESSAGES"> - <Component Id="thg.locale.$(var.LOC)" Guid="*"> + <Component Id="thg.locale.$(var.LOC)" Guid="*" Win64='$(var.IsX64)'>   <File Id="tortoisehg.mo.$(var.LOC)" Name="tortoisehg.mo" KeyPath="yes" />   </Component>   </Directory>
Change 1 of 11 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
7
8
9
 
10
11
12
 
13
14
 
15
16
17
 
85
86
87
88
 
89
90
 
91
92
93
 
95
96
97
98
 
99
100
101
102
103
104
105
 
106
107
108
109
110
111
 
112
113
114
 
123
124
125
126
 
 
127
128
129
 
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
 
178
179
180
181
 
182
183
184
 
187
188
189
190
 
191
192
193
 
199
200
201
202
 
203
204
205
206
207
 
208
209
210
211
212
 
213
214
215
216
217
 
218
219
220
 
222
223
224
225
 
226
227
228
229
230
 
231
232
233
234
235
 
236
237
238
 
260
261
262
263
264
265
266
267
268
 
 
 
 
 
 
 
 
 
 
 
 
 
 
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
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
 
367
368
369
370
371
 
372
373
374
 
7
8
9
10
11
12
 
13
14
 
15
16
17
18
 
86
87
88
 
89
90
 
91
92
93
94
 
96
97
98
 
99
100
101
102
103
104
105
 
106
107
108
109
110
111
 
112
113
114
115
 
124
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
 
187
188
189
190
191
 
192
193
194
195
196
197
198
 
199
200
201
202
 
205
206
207
 
208
209
210
211
 
214
215
216
 
217
218
219
220
 
226
227
228
 
229
230
231
232
233
 
234
235
236
237
238
 
239
240
241
242
243
 
244
245
246
247
 
249
250
251
 
252
253
254
255
256
 
257
258
259
260
261
 
262
263
264
265
 
287
288
289
 
 
 
 
 
 
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
305
306
 
 
 
307
308
309
 
363
364
365
 
 
366
367
368
369
@@ -7,11 +7,12 @@
  GNU General Public License version 2 or any later version. -->     <?include guids.wxi ?> + <?include defines.wxi ?>     <?if $(var.Platform) = "x64" ?> - <?define IsX64 = yes ?> + <?define PFolder = ProgramFiles64Folder ?>   <?else?> - <?define IsX64 = no ?> + <?define PFolder = ProgramFilesFolder ?>   <?endif?>     <?define ProgramRegKey = Software\TortoiseHg ?> @@ -85,9 +86,9 @@
  <Property Id='LicenseAccepted'>1</Property>     <Directory Id='TARGETDIR' Name='SourceDir'> - <Directory Id='ProgramFilesFolder' Name='PFiles'> + <Directory Id='$(var.PFolder)' Name='PFiles'>   <Directory Id='INSTALLDIR' Name='TortoiseHg'> - <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)'> + <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)' Win64='$(var.IsX64)'>   <File Id='thgEXE' Name='thg.exe' KeyPath='yes'   Source='dist\thg.exe'   /> @@ -95,20 +96,20 @@
  Permanent="no" Value="[INSTALLDIR]bin" Action="set"   />   </Component> - <Component Id='WinExecutable' Guid='$(var.ComponentWinExecutableGUID)'> + <Component Id='WinExecutable' Guid='$(var.ComponentWinExecutableGUID)' Win64='$(var.IsX64)'>   <File Id='thgwEXE' Name='thgw.exe' Source='dist\thgw.exe' />   <Shortcut Id="thgStartMenu" Directory="ProgramMenuDir"   Name="TortoiseHg Workbench"   Icon="thgIcon.ico" IconIndex="0" Advertise="yes"   />   </Component> - <Component Id='ExtensionVersions' Guid='$(var.ExtensionVersions.guid)'> + <Component Id='ExtensionVersions' Guid='$(var.ExtensionVersions.guid)' Win64='$(var.IsX64)'>   <File Id='ExtensionVersions' Name='extension-versions.txt'   KeyPath='yes'   Source='..\extension-versions.txt'   />   </Component> - <Component Id='OverlayServerEXE' Guid='$(var.OverlayServerEXE.guid)'> + <Component Id='OverlayServerEXE' Guid='$(var.OverlayServerEXE.guid)' Win64='$(var.IsX64)'>   <File Id='OverlayServerEXE' Name='TortoiseHgOverlayServer.exe'   KeyPath='yes'   Source='dist\TortoiseHgOverlayServer.exe' > @@ -123,7 +124,8 @@
  Type='string' Value='[INSTALLDIR]TortoiseHgOverlayServer.exe'   />   </Component> - <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)'> + + <Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'>   <File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes'   Source='win32\ThgShellx86.dll'   /> @@ -143,33 +145,58 @@
  <?endforeach?>   </Component>   <Component Id='CmenuShellRegistrationX86' - Guid='$(var.CmenuShellRegistrationX86.guid)' - > + Guid='$(var.CmenuShellRegistrationX86.guid)' Win64='no'>   <?include shell-register-cmenu.wxi ?>   </Component>   <Component Id='OverlaysShellRegistrationX86' - Guid='$(var.OverlaysShellRegistrationX86.guid)' - > + Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'>   <?include shell-register-overlays.wxi ?>   </Component> - <Component Id='COPYING' Guid='$(var.COPYING.guid)'> + + <?if $(var.Platform) = "x64" ?> + <Component Id='thgshellx64dll' Guid='$(var.thgshellx64dll.guid)' Win64='yes'> + <File Id='thgshellx64dll' Name='ThgShellx64.dll' KeyPath='yes' + Source='win32\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'/> + <?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 shell-register-cmenu.wxi ?> + </Component> + <Component Id='OverlaysShellRegistrationX64' Win64='yes' + Guid='$(var.OverlaysShellRegistrationX64.guid)'> + <?include 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'   />   </Component> - <Component Id='docdiffEXE' Guid='$(var.docdiffEXE.guid)'> + <Component Id='docdiffEXE' Guid='$(var.docdiffEXE.guid)' Win64='$(var.IsX64)'>   <File Id='docdiffEXE' Name='docdiff.exe' KeyPath='yes'   Source='dist\docdiff.exe'   />   </Component> - <Component Id='KDiff3EXE' Guid='$(var.KDiff3EXE.guid)'> + <Component Id='KDiff3EXE' Guid='$(var.KDiff3EXE.guid)' Win64='$(var.IsX64)'>   <File Id='KDiff3EXE' Name='kdiff3.exe' KeyPath='yes'   Source='..\contrib\kdiff3.exe'   />   </Component>     <Directory Id='docFolder' Name='doc'> - <Component Id='chmFile' Guid='$(var.chmFile.guid)'> + <Component Id='chmFile' Guid='$(var.chmFile.guid)' Win64='$(var.IsX64)'>   <File Id='chmFile' Name='TortoiseHg.chm' KeyPath='yes'   Source='doc\build\chm\TortoiseHg.chm' >   <Shortcut Id="chmStartMenu" Directory="ProgramMenuDir" @@ -178,7 +205,7 @@
  />   </File>   </Component> - <Component Id='pdfFile' Guid='$(var.pdfFile.guid)'> + <Component Id='pdfFile' Guid='$(var.pdfFile.guid)' Win64='$(var.IsX64)'>   <File Id='pdfFile' Name='TortoiseHg.pdf' KeyPath='yes'   Source='doc\build\pdf\TortoiseHg.pdf'>   <Shortcut Id="pdfStartMenu" Directory="ProgramMenuDir" @@ -187,7 +214,7 @@
  />   </File>   </Component> - <Component Id='hgbook' Guid='$(var.hgbook.guid)'> + <Component Id='hgbook' Guid='$(var.hgbook.guid)' Win64='$(var.IsX64)'>   <File Id='hgbook' Name='hgbook.pdf' KeyPath='yes'   Source='..\misc\hgbook.pdf'>   <Shortcut Id="hgbookStartMenu" Directory="ProgramMenuDir" @@ -199,22 +226,22 @@
  </Directory>     <Directory Id='binFolder' Name='bin'> - <Component Id='TortoisePlinkEXE' Guid='$(var.TortoisePlinkEXE.guid)'> + <Component Id='TortoisePlinkEXE' Guid='$(var.TortoisePlinkEXE.guid)' Win64='$(var.IsX64)'>   <File Id='TortoisePlinkEXE' Name='TortoisePlink.exe' KeyPath='yes'   Source='..\contrib\TortoisePlink.exe'   />   </Component> - <Component Id='PageantEXE' Guid='$(var.PageantEXE.guid)'> + <Component Id='PageantEXE' Guid='$(var.PageantEXE.guid)' Win64='$(var.IsX64)'>   <File Id='PageantEXE' Name='Pageant.exe' KeyPath='yes'   Source='..\contrib\Pageant.exe'   />   </Component> - <Component Id='ThgCmd' Guid='$(var.thgcmd.guid)'> + <Component Id='ThgCmd' Guid='$(var.thgcmd.guid)' Win64='$(var.IsX64)'>   <File Id='Thg.Cmd' Name='thg.cmd' KeyPath='yes'   Source='win32\thg.cmd'   />   </Component> - <Component Id='HgCmd' Guid='$(var.hgcmd.guid)'> + <Component Id='HgCmd' Guid='$(var.hgcmd.guid)' Win64='$(var.IsX64)'>   <File Id='Hg.Cmd' Name='hg.cmd' KeyPath='yes'   Source='win32\hg.cmd'   /> @@ -222,17 +249,17 @@
  </Directory>     <Directory Id='HGRCD' Name='hgrc.d'> - <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)'> + <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)' Win64='$(var.IsX64)'>   <File Id='mercurial.rc' Name='Mercurial.rc' ReadOnly='yes'   Source='win32\mercurial.rc'   />   </Component> - <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)'> + <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)' Win64='$(var.IsX64)'>   <File Id='mergetools.rc' Name='MergeTools.rc' ReadOnly='yes'   Source='contrib\mergetools.rc'   />   </Component> - <Component Id="mergepatterns.rc" Guid='$(var.mergepatterns.rc.guid)'> + <Component Id="mergepatterns.rc" Guid='$(var.mergepatterns.rc.guid)' Win64='$(var.IsX64)'>   <File Id='mergepatterns.rc' Name='MergePatterns.rc'   ReadOnly='yes' KeyPath='yes'   Source='win32\mergepatterns.rc' @@ -260,54 +287,23 @@
  </Directory>   </Directory>   - <Merge Id='VCRedist' DiskId='1' Language='1033' - SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' - /> - <Merge Id='VCRedistPolicy' DiskId='1' Language='1033' - SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' - /> + <?if $(var.Platform) = "x86" ?> + <Merge Id='VCRedist' DiskId='1' Language='1033' + SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm'/> + <Merge Id='VCRedistPolicy' DiskId='1' Language='1033' + SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm'/> + <?else?> + <Merge Id='VCRedist' DiskId='1' Language='1033' + SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x64_msm.msm'/> + <Merge Id='VCRedistPolicy' DiskId='1' Language='1033' + SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x64_msm.msm'/> + <Merge Id='TortoiseOverlaysMergeX64' Language='0' DiskId='1' + SourceFile='$(var.TOverlaysSrcDir)\$(var.TOverlaysSrcFilenameX64)'/> + <?endif?> +   <Merge Id='TortoiseOverlaysMergeX86' Language='0' DiskId='1' - SourceFile='$(var.TOverlaysSrcDir)\$(var.TOverlaysSrcFilenameX86)' - /> - <?if $(var.Platform) = "x64" ?> - <Merge Id='TortoiseOverlaysMergeX64' Language='0' DiskId='1' - SourceFile='$(var.TOverlaysSrcDir)\$(var.TOverlaysSrcFilenameX64)' - /> - <Directory Id="CommonFiles64Folder" Name="Programs64" > - <Directory Id="Common64" Name="TortoiseHg" > - <Component Id='thgshellx64dll' Guid='$(var.thgshellx64dll.guid)' Win64='yes'> - <File Id='thgshellx64dll' Name='ThgShellx64.dll' KeyPath='yes' - Source='win32\ThgShellx64.dll' - /> - <RegistryValue - Root='HKLM' Key='$(var.ProgramRegKey)' - Type='string' Value='[INSTALLDIR]' - /> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgCmenu)\InProcServer32' - Type='string' Value='[Common64]ThgShellx64.dll' - /> - <?foreach CLSID in $(var.OverlayCLSIDList) ?> - <RegistryValue - Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32' - Type='string' Value='[Common64]ThgShellx64.dll' - /> - <?endforeach?> - </Component> - <Component Id='CmenuShellRegistrationX64' Win64='yes' - Guid='$(var.CmenuShellRegistrationX64.guid)' - > - <?include shell-register-cmenu.wxi ?> - </Component> - <Component Id='OverlaysShellRegistrationX64' Win64='yes' - Guid='$(var.OverlaysShellRegistrationX64.guid)' - > - <?include shell-register-overlays.wxi ?> - </Component> + SourceFile='$(var.TOverlaysSrcDir)\$(var.TOverlaysSrcFilenameX86)'/>   - </Directory> - </Directory> - <?endif?>   </Directory>     <Feature Id='Complete' Title='TortoiseHg' @@ -367,8 +363,7 @@
  <ComponentRef Id='CmenuShellRegistrationX86' />   <Feature Id='OverlaysX86' Title='Overlay Icons'   Level='1' AllowAdvertise='no' - Description='Overlay icons for 32-bit processes' - > + Description='Overlay icons for 32-bit processes'>   <ComponentRef Id='OverlayServerEXE' />   <MergeRef Id='TortoiseOverlaysMergeX86' />   <ComponentRef Id='OverlaysShellRegistrationX86' />