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

wix: new GUIDs, new dist.wxs for build output

Changeset fddf1602592d…

Parent e6730838dfaf…

by Steve Borho

Changes to 3 files · Browse files at fddf1602592d Showing diff from parent e6730838dfaf Diff from another changeset...

Change 1 of 1 Show Entire File win32/​wix/​dist.wxs 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
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + + <?include guids.wxi ?> + + <Fragment> + <DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)"> + <Component Id="distOutput" Guid="$(var.dist.guid)"> + <File Name="library.zip" KeyPath="yes" /> + <File Name="hg.exe" /> + <File Name="mercurial.base85.pyd" /> + <File Name="mercurial.bdiff.pyd" /> + <File Name="mercurial.diffhelpers.pyd" /> + <File Name="mercurial.mpatch.pyd" /> + <File Name="mercurial.osutil.pyd" /> + <File Name="mercurial.parsers.pyd" /> + <File Name="mingwm10.dll" /> + <File Name="pyexpat.pyd" /> + <File Name="PyQt4.Qsci.pyd" /> + <File Name="PyQt4.QtCore.pyd" /> + <File Name="PyQt4.QtGui.pyd" /> + <File Name="libgcc_s_dw2-1.dll" /> + <File Name="python26.dll" /> + <File Name="pythoncom26.dll" /> + <File Name="pywintypes26.dll" /> + <File Name="QtCore4.dll" /> + <File Name="QtGui4.dll" /> + <File Name="qscintilla2.dll" /> + <File Name="select.pyd" /> + <File Name="sip.pyd" /> + <File Name="unicodedata.pyd" /> + <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" /> + <File Name="win32net.pyd" /> + <File Name="win32pipe.pyd" /> + <File Name="win32process.pyd" /> + <File Name="win32security.pyd" /> + <File Name="win32trace.pyd" /> + <File Name="_ctypes.pyd" /> + <File Name="_ctypes_test.pyd" /> + <File Name="_elementtree.pyd" /> + <File Name="_hashlib.pyd" /> + <File Name="_socket.pyd" /> + <File Name="_ssl.pyd" /> + <File Name="_win32sysloader.pyd" /> + </Component> + </DirectoryRef> + </Fragment> + + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Directory Id="imgFmtDir" Name="imageformats" FileSource="$(var.SourceDir)/imageformats"> + <Component Id="imageFormats" Guid="$(var.imageformats.guid)"> + <File Name="qico4.exe" KeyPath="yes" /> + <File Name="qsvg4.exe" /> + </Component> + </Directory> + </DirectoryRef> + </Fragment> + +</Wix>
Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
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
 
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
@@ -5,75 +5,79 @@
  your project. Component GUIDs have global namespace! -->     <!-- contrib.wxs --> - <?define contrib.guid = {D3BC122A-163C-4ef9-91C2-62E04B128A16} ?> - <?define contrib.vim.guid = {BEA4DF96-9CEF-4273-B637-8DE7B10A6FAE} ?> + <?define contrib.guid = {FB2DD7A3-B0D8-4E4A-BA52-71B32647AD6E} ?> + <?define contrib.vim.guid = {7B712AF4-6BBE-41A4-95F3-05AD4D8BFDE3} ?>     <!-- doc.wxs --> - <?define doc.hg.1.html.guid = {6289D803-14D9-4AF8-AE67-4DB12D1EA5A6} ?> - <?define doc.hgignore.5.html.guid = {4E80FFF0-C28A-460F-ABC4-85BC25422B80} ?> - <?define doc.hgrc.5.html = {F392839B-CEB6-462E-8F23-A85D48F99BD3} ?> - <?define doc.style.css = {5C276050-DDDD-49FB-86ED-C636FD629242} ?> + <?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 = {D056C216-291F-4304-B791-BD5C5807DD87} ?> + <?define helpFolder.guid = {FED1C75C-EA84-4446-BF0D-9946A37DA0BB} ?>     <!-- i18n.wxs --> - <?define i18nFolder.guid = {3115A038-CA56-4413-97C1-6F0070D6034C} ?> + <?define i18nFolder.guid = {F88D7B07-D61C-4EE8-9BE0-B8CB6E8A52DB} ?>     <!-- templates.wxs --> - <?define templates.root.guid = {C609F85B-91CD-463f-8C07-57931D53B99F} ?> - <?define templates.atom.guid = {0155E267-F0D5-4115-A7D4-F217599B06C7} ?> - <?define templates.coal.guid = {310F768C-0817-4a07-907C-89AB8FDAE9DE} ?> - <?define templates.gitweb.guid = {6A6B3DFF-EC52-479a-842C-A650FCF2D39C} ?> - <?define templates.monoblue.guid = {3AA37057-AFB1-4150-8062-2372257A91D2} ?> - <?define templates.paper.guid = {071CFCD8-2F96-4df8-8539-EF3D8176A0FB} ?> - <?define templates.raw.guid = {F71E0FEB-32F9-4b18-91A5-A59722C682DC} ?> - <?define templates.rss.guid = {23DA0B15-6463-400b-95E0-CD5FAD6B75B5} ?> - <?define templates.spartan.guid = {0686468F-D950-422f-A904-1B09FFD3C852} ?> - <?define templates.static.guid = {9AC0E261-7563-4147-9974-12022C1CBD4E} ?> + <?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 = {AD6698BB-3112-4ECE-9B7D-8D2C75F784A9} ?> + <?define templates.monoblue.guid = {0E6F72ED-1CE9-4D62-9A0A-D79DB65C334A} ?> + <?define templates.paper.guid = {937903FD-5C1C-4CDF-B83E-E4F710640989} ?> + <?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 = {2AE187A2-638D-42D5-8F7E-D5B9722F3296} ?> + <?define imageformats.guid = {056DFB00-3EB1-4ACA-A43B-55CD5004DED1} ?>     <!-- cmenu-i18n.wxs --> - <?define cmenuI18n.guid = {B0AB4947-248C-4c6b-841C-49284EF99022} ?> + <?define cmenuI18n.guid = {25A9DAFA-FF37-420C-9958-5920301E293A} ?>     <!-- icons.wxs --> - <?define Icons.guid = {30E997E7-FB02-4d34-AF61-A6FD6C93E268} ?> - <?define SvgIcons.guid = {7C87CCC7-8377-49c8-ACFD-1F246ED14747} ?> + <?define Icons.guid = {BBC91828-1D14-4BD2-AE23-892770DAD3FF} ?> + <?define SvgIcons.guid = {75139DBD-8E51-4332-A5B4-7299E68FFBE9} ?>     <!-- thg-i18n.wxs --> - <?define thgI18nFolder.guid = {69E6E182-BCD2-4b03-A941-7B9A054DF7AF} ?> + <?define thgI18nFolder.guid = {55DC742A-1E22-4A6C-B090-FD1E91AB8646} ?>     <!-- tortoisehg.wxs --> - <?define ProductUpgradeCode = {838657CF-C9EC-452D-800D-0E70FC021D0A} ?> + <?define ProductUpgradeCode = {F6FC11E9-0629-4D51-9286-E7ED9C8A54BD} ?>   - <?define ComponentMainExecutableGUID = {CD691D8E-79AD-4e22-9234-89C62B5C2243} ?> + <?define ComponentMainExecutableGUID = {D648EC48-559C-4C66-A4CE-2D40A495DC5B} ?>   - <?define thgshellx86dll.guid = {1126CF42-3994-428B-A746-464E1BC680F3} ?> - <?define thgshellx64dll.guid = {59FD2A49-BA62-40CC-B155-D11DB11EE611} ?> + <?define thgshellx86dll.guid = {728E8840-5878-4EA7-918F-281C2697ABB1} ?> + <?define thgshellx64dll.guid = {D5D1E532-CDAD-4FFD-9695-757B8A29B4BA} ?>   - <?define CmenuShellRegistrationX86.guid = {287A355F-3DF6-4f55-9DD5-FABD09498B0C} ?> - <?define CmenuShellRegistrationX64.guid = {46DF4532-7BFF-427a-BC59-F3B4D1022F56} ?> + <?define CmenuShellRegistrationX86.guid = {2BF442D0-EBD9-4B03-8F78-0F45C28F8AB5} ?> + <?define CmenuShellRegistrationX64.guid = {858CE519-8BA2-4E80-BBEB-591AE78384FA} ?>   - <?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 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 = {1996AB0D-634D-4DC8-9581-326151F38B11} ?> - <?define COPYING.guid = {382A8405-CB7B-42E8-8B9D-88B5C5283E73} ?> + <?define ExtensionVersions.guid = {4ADF436B-9B25-4D95-B6AC-88717F5A037A} ?> + <?define COPYING.guid = {09DEF174-D0AB-4E8B-8A4E-1AD5B7E4C9BD} ?>   - <?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 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 chmFile.guid = {A26038DC-C686-4296-9335-FA4B9ABC769C} ?> - <?define pdfFile.guid = {1C5792DA-C48F-4F7F-9CD8-FC467995B8E4} ?> - <?define hgbook.guid = {A5F6D094-BCFD-4AC0-8675-7DF8CC94FEE5} ?> + <?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 = {28ACE5D7-FFCE-488E-A94A-8F13A21DD25D} ?> - <?define mergetools.rc.guid = {30CC047C-48B4-4D91-B8EC-79975327A9C7} ?> - <?define mergepatterns.rc.guid = {05860DA7-8391-43A4-A4E7-6E9E084D11C6} ?> + <?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 ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?> - <?define ThgAppData.guid = {94B8FBB5-4AE3-4960-B3D8-94BEFC6366E9} ?> + <?define ProgramMenuDir.guid = {77EDD1A4-FF9A-41CB-83D7-8141D67F0367} ?> + <?define ThgAppData.guid = {4264E496-A992-48E7-92EB-A3BF21E71E41} ?>    </Include>
Change 1 of 2 Show Entire File win32/​wix/​tortoisehg.wxs Stacked
 
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
 
320
321
322
 
323
324
325
 
91
92
93
 
 
 
 
 
 
 
 
 
94
95
96
 
311
312
313
314
315
316
317
@@ -91,15 +91,6 @@
  <File Id='thgEXE' Name='thg.exe' KeyPath='yes'   Source='dist\thg.exe'   /> - <File Id='hgEXE' Name='hg.exe' - Source='dist\hg.exe' - /> - <File Id='libraryZIP' Name='library.zip' - Source='dist\library.zip' - /> - <File Id='pythonDLL' Name='python26.dll' - Source='dist\python26.dll' - />   <Environment Id="Environment" Name="PATH" Part="last" System="yes"   Permanent="no" Value="[INSTALLDIR]" Action="set"   /> @@ -320,6 +311,7 @@
  <ComponentRef Id='mergetools.rc' />   <ComponentRef Id='ExtensionVersions' />   <ComponentRef Id='helpFolder' /> + <ComponentRef Id='distOutput' />   <ComponentGroupRef Id='templatesFolder' />   <ComponentRef Id='Icons' />   <ComponentRef Id='SvgIcons' />