Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.1, 2.0.2, and 2.0.3

stable wix: drop bin/ folder, add root install folder to %PATH%

There's been a lot of blow back about the batch files and bin folder, the most
serious of which is that batch files break other batch files so for Mercurial
1.8.1 we'll go back to placing the root folder in the %PATH%.

My hope is that the DLL conflicts we saw in the past were mostly caused by GTK.
We'll see which way inflicts more pain.

Refs #60, #201, #239 and Mercurial issues 2658 and 2673

Changeset 805f941ee0c1…

Parent 611db252477e…

by Steve Borho

Changes to 4 files · Browse files at 805f941ee0c1 Showing diff from parent 611db252477e Diff from another changeset...

Change 1 of 1 Show Entire File win32/​hg.cmd Stacked
 
1
2
3
 
 
 
 
@@ -1,3 +0,0 @@
-@echo off -rem launch hg.exe from parent folder -"%~dp0\..\hg.exe" %*
Change 1 of 1 Show Entire File win32/​thg.cmd Stacked
 
1
2
3
 
 
 
 
@@ -1,3 +0,0 @@
-@echo off -rem launch thg.exe from parent folder -"%~dp0\..\thg.exe" %*
Change 1 of 1 Show Changes Only win32/​wix/​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
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
88
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
 <Include>   <!-- These are component GUIDs used for TortoiseHg installers.   YOU MUST CHANGE ALL GUIDs below when copying this file   and replace 'TortoiseHg' in this notice with the name of   your project. Component GUIDs have global namespace! -->     <!-- contrib.wxs -->   <?define contrib.guid = {FB2DD7A3-B0D8-4E4A-BA52-71B32647AD6E} ?>   <?define contrib.vim.guid = {A28DEFA6-474A-4659-82B4-8EF68042D859} ?>     <!-- doc.wxs -->   <?define doc.hg.1.html.guid = {3EDDF378-AB13-4B49-ADDF-67EFDD30AA69} ?>   <?define doc.hgignore.5.html.guid = {98A703CD-DCD5-422B-BB41-5B1BE196979B} ?>   <?define doc.hgrc.5.html = {AC2F61E1-E9D1-4C67-B592-17FA68F75A0A} ?>   <?define doc.style.css = {F42E2E5F-6329-4269-B6D8-805C6CFD8D5E} ?>     <!-- help.wxs -->   <?define helpFolder.guid = {4B71277D-72E9-48F2-8A06-C706E9C3B4C0} ?>     <!-- i18n.wxs -->   <?define i18nFolder.guid = {F88D7B07-D61C-4EE8-9BE0-B8CB6E8A52DB} ?>     <!-- templates.wxs -->   <?define templates.root.guid = {6A82D0BF-6878-42F3-92FD-AB39F7A97EEF} ?>   <?define templates.atom.guid = {602F0A54-F5AF-4D22-A2FE-80A188531D02} ?>   <?define templates.coal.guid = {89768AB3-A942-470B-8C1C-9C026B80FF8E} ?>   <?define templates.gitweb.guid = {66F4305F-8AC6-4B55-AC24-30FFC3161EF0} ?>   <?define templates.monoblue.guid = {F1CC0065-B3D2-4D4C-BD7F-EFDBB4B47CBB} ?>   <?define templates.paper.guid = {8856C832-EAC1-4198-9A72-7DEBF2D00A10} ?>   <?define templates.raw.guid = {936139F7-9A73-4685-80D2-F17A2BC42EAD} ?>   <?define templates.rss.guid = {891DA56F-B02B-456F-8471-FE47024051E7} ?>   <?define templates.spartan.guid = {C49A4A44-53EB-4C37-AA0B-159070F46E84} ?>   <?define templates.static.guid = {ECF8D1EF-910D-4586-9508-86A6236B4FD5} ?>     <!-- dist.wxs -->   <?define dist.guid = {82AD6653-B84F-4f73-B4AC-755D6CAA8F55} ?>   <?define imageformats.guid = {056DFB00-3EB1-4ACA-A43B-55CD5004DED1} ?>     <!-- cmenu-i18n.wxs -->   <?define cmenuI18n.guid = {25A9DAFA-FF37-420C-9958-5920301E293A} ?>     <!-- icons.wxs -->   <?define Icons.guid = {34369923-9610-461C-9FB3-26CA3A139836} ?>     <!-- thg-i18n.wxs -->   <?define thgI18nFolder.guid = {55DC742A-1E22-4A6C-B090-FD1E91AB8646} ?>     <!-- tortoisehg.wxs -->   <?define ProductUpgradeCode = {838657CF-C9EC-452D-800D-0E70FC021D0A} ?>     <?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} ?>   <?define COPYING.guid = {09DEF174-D0AB-4E8B-8A4E-1AD5B7E4C9BD} ?>     <?define docdiffEXE.guid = {F4A6629F-85C1-406E-8262-C02E8DBDB4FA} ?>   <?define KDiff3EXE.guid = {075ECC11-1B44-48DB-B7FD-D3207BB801A4} ?>   - <?define TortoisePlinkEXE.guid = {7679909C-7390-4546-9FCA-A5A31520DA50} ?> - <?define PageantEXE.guid = {228F24A3-FA1C-4439-BCB4-71DF790E61DC} ?> - <?define thgcmd.guid = {7B660ED7-CAEA-4851-8ABD-751251842457} ?> - <?define hgcmd.guid = {4A986763-BD4D-46DC-89CD-A36F037D847E} ?> + <?define TortoisePlinkEXE.guid = {E983CBBB-BD4E-4698-BE6F-CECB80D5BA76} ?> + <?define PageantEXE.guid = {91F28A55-874F-4957-A288-BB0F24E419A4} ?>     <?define chmFile.guid = {422C758A-6CB2-4531-BE6A-366B3CD1FD8D} ?>   <?define pdfFile.guid = {A0EC2473-996A-4DBC-9F44-76B63B57AE31} ?>   <?define hgbook.guid = {BC46DD44-1A5B-408F-86E2-BB89C8A380C1} ?>     <?define mercurial.rc.guid = {97EC54BA-02F7-40CD-B876-0572AF7D894B} ?>   <?define mergetools.rc.guid = {EA7F7766-FC75-489F-91AE-3B16E5FE936E} ?>   <?define mergepatterns.rc.guid = {3372ED83-BCE1-4AD3-B5EA-65158C715B54} ?>   <?define paths.rc.guid = {2D94117B-32EC-4507-8E77-AF9D5BC5EA87} ?>   <?define cacert.pem.guid = {37D0A0FC-817D-4DD0-8A07-3841E13092E6} ?>     <?define ProgramMenuDir.guid = {77EDD1A4-FF9A-41CB-83D7-8141D67F0367} ?>   <?define ThgAppData.guid = {4264E496-A992-48E7-92EB-A3BF21E71E41} ?>    </Include>
Change 1 of 4 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
93
94
95
96
 
97
98
99
 
197
198
199
 
 
 
 
 
 
 
 
 
 
 
200
201
202
 
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
 
385
386
387
388
389
390
391
392
 
93
94
95
 
96
97
98
99
 
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
 
250
251
252
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
253
254
255
 
373
374
375
 
 
376
377
378
@@ -93,7 +93,7 @@
  Source='dist\thg.exe'   />   <Environment Id="Environment" Name="PATH" Part="last" System="yes" - Permanent="no" Value="[INSTALLDIR]bin" Action="set" + Permanent="no" Value="[INSTALLDIR]" Action="set"   />   </Component>   <Component Id='WinExecutable' Guid='$(var.ComponentWinExecutableGUID)' Win64='$(var.IsX64)'> @@ -197,6 +197,17 @@
  />   </Component>   + <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)' Win64='$(var.IsX64)'> + <File Id='PageantEXE' Name='Pageant.exe' KeyPath='yes' + Source='..\contrib\Pageant.exe' + /> + </Component> +   <?if $(var.Platform) = "x64" ?>   <Component Id='KDiff3EXE' Guid='$(var.KDiff3EXE.guid)' Win64='$(var.IsX64)'>   <File Id='KDiff3EXE' Name='kdiff3.exe' KeyPath='yes' @@ -239,29 +250,6 @@
  </Component>   </Directory>   - <Directory Id='binFolder' Name='bin'> - <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)' Win64='$(var.IsX64)'> - <File Id='PageantEXE' Name='Pageant.exe' KeyPath='yes' - Source='..\contrib\Pageant.exe' - /> - </Component> - <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)' Win64='$(var.IsX64)'> - <File Id='Hg.Cmd' Name='hg.cmd' KeyPath='yes' - Source='win32\hg.cmd' - /> - </Component> - </Directory> -   <Directory Id='HGRCD' Name='hgrc.d'>   <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)' Win64='$(var.IsX64)'>   <File Id='mercurial.rc' Name='Mercurial.rc' ReadOnly='yes' @@ -385,8 +373,6 @@
  <ComponentRef Id='helpFolder' />   <ComponentRef Id='distOutput' />   <ComponentRef Id='imageFormats' /> - <ComponentRef Id='ThgCmd' /> - <ComponentRef Id='HgCmd' />   <ComponentGroupRef Id='templatesFolder' />   <ComponentRef Id='Icons' />   </Feature>