Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

wix: adjust to javascript changes on tip of mercurial default

Changeset 700b842344e2…

Parent be86dd9c982b…

by Steve Borho

Changes to 2 files · Browse files at 700b842344e2 Showing diff from parent be86dd9c982b Diff from another changeset...

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
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 = {5191051C-742F-470E-AD76-D83C2F1EDE4E} ?>     <!-- 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 = {516308AA-E5F5-4545-BA2C-1FCB3EF0C649} ?>   <?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} ?> + <?define templates.static.guid = {B6C414E5-CD1E-4820-86E7-EEC2386426BE} ?>     <!-- dist.wxs -->   <?define dist.guid = {9A429564-6BA8-4F18-ACCF-59C586364FFC} ?>   <?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 = {BC570E20-FB79-49B8-AFEF-B4BB867EE60F} ?>     <!-- 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 = {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 1 Show Entire File win32/​wix/​templates.wxs Stacked
 
195
196
197
198
 
199
200
201
 
195
196
197
 
198
199
200
201
@@ -195,7 +195,7 @@
  <File Id="static.coal.file.png" Name="coal-file.png" />   <File Id="static.coal.folder.png" Name="coal-folder.png" />   <File Id="static.excanvas.js" Name="excanvas.js" /> - <File Id="static.graph.js" Name="graph.js" /> + <File Id="static.mercurial.js" Name="mercurial.js" />   <File Id="static.hgicon.png" Name="hgicon.png" />   <File Id="static.hglogo.png" Name="hglogo.png" />   <File Id="static.style.coal.css" Name="style-coal.css" />