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 common component GUIDs into include file

Changeset b00a9872f14f…

Parent 768a71064028…

by Adrian Buehlmann

Changes to 6 files · Browse files at b00a9872f14f Showing diff from parent 768a71064028 Diff from another changeset...

Change 1 of 3 Show Entire File contrib/​wix/​contrib.wxs Stacked
 
1
2
 
 
 
3
4
5
 
9
10
11
12
 
13
14
15
 
23
24
25
26
 
27
28
29
 
1
2
3
4
5
6
7
8
 
12
13
14
 
15
16
17
18
 
26
27
28
 
29
30
31
32
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + + <?include guids.wxi ?> +   <Fragment>   <ComponentGroup Id="contribFolder">   <ComponentRef Id="contrib" /> @@ -9,7 +12,7 @@
  <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="contribdir" Name="contrib"> - <Component Id="contrib" Guid="{509AE2EF-3AC6-4661-A9C3-51F663BE83B2}"> + <Component Id="contrib" Guid="$(var.contrib.guid)">   <File Source="$(var.SourceDir)\bash_completion" KeyPath="yes" />   <File Source="$(var.SourceDir)\hgk" />   <File Source="$(var.SourceDir)\hgwebdir.fcgi" /> @@ -23,7 +26,7 @@
  <File Source="$(var.SourceDir)\zsh_completion" />   </Component>   <Directory Id="vimdir" Name="vim"> - <Component Id="contrib.vim" Guid="{BEA4DF96-9CEF-4273-B637-8DE7B10A6FAE}"> + <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)">   <File Source="$(var.SourceDir)\vim\hg-menu.vim" KeyPath="yes" />   <File Source="$(var.SourceDir)\vim\HGAnnotate.vim" />   <File Source="$(var.SourceDir)\vim\hgcommand.vim" />
Change 1 of 5 Show Entire File contrib/​wix/​doc.wxs Stacked
 
1
2
 
 
 
3
4
5
 
8
9
10
11
 
12
13
14
 
17
18
19
20
 
21
22
23
 
26
27
28
29
 
30
31
32
 
35
36
37
38
 
39
40
41
 
1
2
3
4
5
6
7
8
 
11
12
13
 
14
15
16
17
 
20
21
22
 
23
24
25
26
 
29
30
31
 
32
33
34
35
 
38
39
40
 
41
42
43
44
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + + <?include guids.wxi ?> +   <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="docdir" Name="doc" /> @@ -8,7 +11,7 @@
  <Fragment>   <ComponentGroup Id="docFolder">   <Component Id="doc.hg.1.html" Directory="docdir" - Guid="{6289D803-14D9-4AF8-AE67-4DB12D1EA5A6}" + Guid="$(var.doc.hg.1.html.guid)"   >   <File Source="$(var.SourceDir)\hg.1.html" KeyPath="yes">   <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir" @@ -17,7 +20,7 @@
  </File>   </Component>   <Component Id="doc.hgignore.5.html" Directory="docdir" - Guid="{4E80FFF0-C28A-460F-ABC4-85BC25422B80}" + Guid="$(var.doc.hgignore.5.html.guid)"   >   <File Source="$(var.SourceDir)\hgignore.5.html" KeyPath="yes">   <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir" @@ -26,7 +29,7 @@
  </File>   </Component>   <Component Id="doc.hgrc.5.html" Directory="docdir" - Guid="{F392839B-CEB6-462E-8F23-A85D48F99BD3}" + Guid="$(var.doc.hgrc.5.html)"   >   <File Source="$(var.SourceDir)\hgrc.5.html" KeyPath="yes">   <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir" @@ -35,7 +38,7 @@
  </File>   </Component>   <Component Id="doc.style.css" Directory="docdir" - Guid="{5C276050-DDDD-49FB-86ED-C636FD629242}" + Guid="$(var.doc.style.css)"   >   <File Source="$(var.SourceDir)\style.css" KeyPath="yes" />   </Component>
Change 1 of 1 Show Entire File contrib/​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
@@ -0,0 +1,31 @@
+<Include> + + <!-- contrib.wxs --> + <?define contrib.guid = {509AE2EF-3AC6-4661-A9C3-51F663BE83B2} ?> + <?define contrib.vim.guid = {BEA4DF96-9CEF-4273-B637-8DE7B10A6FAE} ?> + + <!-- 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} ?> + + <!-- help.wxs --> + <?define helpFolder.guid = {5D9D7DDC-62D4-4fc9-8419-D13ECB25B8D2} ?> + + <!-- i18n.wxs --> + <?define i18nFolder.guid = {3115A038-CA56-4413-97C1-6F0070D6034C} ?> + + <!-- 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} ?> + +</Include>
Change 1 of 1 Show Entire File contrib/​wix/​help.wxs Stacked
 
1
2
 
 
 
3
4
5
6
 
7
8
9
 
1
2
3
4
5
6
7
8
 
9
10
11
12
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + + <?include guids.wxi ?> +   <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="helpdir" Name="help"> - <Component Id="helpFolder" Guid="{5D9D7DDC-62D4-4fc9-8419-D13ECB25B8D2}"> + <Component Id="helpFolder" Guid="$(var.helpFolder.guid)">   <File Source="$(var.SourceDir)\config.txt" KeyPath="yes" />   <File Source="$(var.SourceDir)\dates.txt" />   <File Source="$(var.SourceDir)\diffs.txt" />
Change 1 of 1 Show Entire File contrib/​wix/​i18n.wxs Stacked
 
1
2
3
 
 
4
5
6
7
8
9
 
10
11
12
 
1
2
3
4
5
6
7
8
9
10
 
11
12
13
14
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   + <?include guids.wxi ?> +   <?define hg_po_langs = da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW ?>     <Fragment>   <DirectoryRef Id="INSTALLDIR">   <Directory Id="i18ndir" Name="i18n"> - <Component Id="i18nFolder" Guid="{3115A038-CA56-4413-97C1-6F0070D6034C}"> + <Component Id="i18nFolder" Guid="$(var.i18nFolder.guid)">   <File Source="$(var.SourceDir)\hggettext" KeyPath="yes" />   <?foreach LANG in $(var.hg_po_langs) ?>   <File Id="hg.$(var.LANG).po" Source="$(var.SourceDir)\$(var.LANG).po" />
Change 1 of 10 Show Entire File contrib/​wix/​templates.wxs Stacked
 
1
2
3
 
 
4
5
6
 
24
25
26
27
 
28
29
30
 
33
34
35
36
 
37
38
39
 
46
47
48
49
 
50
51
52
53
54
55
56
 
57
58
59
 
78
79
80
81
 
82
83
84
 
103
104
105
106
 
107
108
109
 
127
128
129
130
 
131
132
133
 
140
141
142
143
 
144
145
146
 
154
155
156
157
 
158
159
160
 
180
181
182
183
 
184
185
186
 
1
2
3
4
5
6
7
8
 
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
 
80
81
82
 
83
84
85
86
 
105
106
107
 
108
109
110
111
 
129
130
131
 
132
133
134
135
 
142
143
144
 
145
146
147
148
 
156
157
158
 
159
160
161
162
 
182
183
184
 
185
186
187
188
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   + <?include guids.wxi ?> +   <Fragment>   <ComponentGroup Id="templatesFolder">   @@ -24,7 +26,7 @@
    <Directory Id="templatesdir" Name="templates">   - <Component Id="templates.root" Guid="{C609F85B-91CD-463f-8C07-57931D53B99F}"> + <Component Id="templates.root" Guid="$(var.templates.root.guid)">   <File Source="$(var.SourceDir)\map-cmdline.changelog" KeyPath="yes" />   <File Source="$(var.SourceDir)\map-cmdline.compact" />   <File Source="$(var.SourceDir)\map-cmdline.default" /> @@ -33,7 +35,7 @@
  </Component>     <Directory Id="templates.atomdir" Name="atom"> - <Component Id="templates.atom" Guid="{0155E267-F0D5-4115-A7D4-F217599B06C7}"> + <Component Id="templates.atom" Guid="$(var.templates.atom.guid)">   <File Id="atom.changelog.tmpl" Source="$(var.SourceDir)\atom\changelog.tmpl" KeyPath="yes" />   <File Id="atom.changelogentry.tmpl" Source="$(var.SourceDir)\atom\changelogentry.tmpl" />   <File Id="atom.error.tmpl" Source="$(var.SourceDir)\atom\error.tmpl" /> @@ -46,14 +48,14 @@
  </Directory>     <Directory Id="templates.coaldir" Name="coal"> - <Component Id="templates.coal" Guid="{310F768C-0817-4a07-907C-89AB8FDAE9DE}"> + <Component Id="templates.coal" Guid="$(var.templates.coal.guid)">   <File Id="coal.header.tmpl" Source="$(var.SourceDir)\coal\header.tmpl" KeyPath="yes" />   <File Id="coal.map" Source="$(var.SourceDir)\coal\map" />   </Component>   </Directory>     <Directory Id="templates.gitwebdir" Name="gitweb"> - <Component Id="templates.gitweb" Guid="{6A6B3DFF-EC52-479a-842C-A650FCF2D39C}"> + <Component Id="templates.gitweb" Guid="$(var.templates.gitweb.guid)">   <File Id="gitweb.branches.tmpl" Source="$(var.SourceDir)\gitweb\branches.tmpl" KeyPath="yes" />   <File Id="gitweb.changelog.tmpl" Source="$(var.SourceDir)\gitweb\changelog.tmpl" />   <File Id="gitweb.changelogentry.tmpl" Source="$(var.SourceDir)\gitweb\changelogentry.tmpl" /> @@ -78,7 +80,7 @@
  </Directory>     <Directory Id="templates.monobluedir" Name="monoblue"> - <Component Id="templates.monoblue" Guid="{3AA37057-AFB1-4150-8062-2372257A91D2}"> + <Component Id="templates.monoblue" Guid="$(var.templates.monoblue.guid)">   <File Id="monoblue.branches.tmpl" Source="$(var.SourceDir)\monoblue\branches.tmpl" KeyPath="yes" />   <File Id="monoblue.changelog.tmpl" Source="$(var.SourceDir)\monoblue\changelog.tmpl" />   <File Id="monoblue.changelogentry.tmpl" Source="$(var.SourceDir)\monoblue\changelogentry.tmpl" /> @@ -103,7 +105,7 @@
  </Directory>     <Directory Id="templates.paperdir" Name="paper"> - <Component Id="templates.paper" Guid="{071CFCD8-2F96-4df8-8539-EF3D8176A0FB}"> + <Component Id="templates.paper" Guid="$(var.templates.paper.guid)">   <File Id="paper.branches.tmpl" Source="$(var.SourceDir)\paper\branches.tmpl" KeyPath="yes" />   <File Id="paper.changeset.tmpl" Source="$(var.SourceDir)\paper\changeset.tmpl" />   <File Id="paper.error.tmpl" Source="$(var.SourceDir)\paper\error.tmpl" /> @@ -127,7 +129,7 @@
  </Directory>     <Directory Id="templates.rawdir" Name="raw"> - <Component Id="templates.raw" Guid="{F71E0FEB-32F9-4b18-91A5-A59722C682DC}"> + <Component Id="templates.raw" Guid="$(var.templates.raw.guid)">   <File Id="raw.changeset.tmpl" Source="$(var.SourceDir)\raw\changeset.tmpl" KeyPath="yes" />   <File Id="raw.error.tmpl" Source="$(var.SourceDir)\raw\error.tmpl" />   <File Id="raw.fileannotate.tmpl" Source="$(var.SourceDir)\raw\fileannotate.tmpl" /> @@ -140,7 +142,7 @@
  </Directory>     <Directory Id="templates.rssdir" Name="rss"> - <Component Id="templates.rss" Guid="{23DA0B15-6463-400b-95E0-CD5FAD6B75B5}"> + <Component Id="templates.rss" Guid="$(var.templates.rss.guid)">   <File Id="rss.changelog.tmpl" Source="$(var.SourceDir)\rss\changelog.tmpl" KeyPath="yes" />   <File Id="rss.changelogentry.tmpl" Source="$(var.SourceDir)\rss\changelogentry.tmpl" />   <File Id="rss.error.tmpl" Source="$(var.SourceDir)\rss\error.tmpl" /> @@ -154,7 +156,7 @@
  </Directory>     <Directory Id="templates.spartandir" Name="spartan"> - <Component Id="templates.spartan" Guid="{0686468F-D950-422f-A904-1B09FFD3C852}"> + <Component Id="templates.spartan" Guid="$(var.templates.spartan.guid)">   <File Id="spartan.branches.tmpl" Source="$(var.SourceDir)\spartan\branches.tmpl" KeyPath="yes" />   <File Id="spartan.changelog.tmpl" Source="$(var.SourceDir)\spartan\changelog.tmpl" />   <File Id="spartan.changelogentry.tmpl" Source="$(var.SourceDir)\spartan\changelogentry.tmpl" /> @@ -180,7 +182,7 @@
  </Directory>     <Directory Id="templates.staticdir" Name="static"> - <Component Id="templates.static" Guid="{9AC0E261-7563-4147-9974-12022C1CBD4E}"> + <Component Id="templates.static" Guid="$(var.templates.static.guid)">   <File Id="static.background.png" Source="$(var.SourceDir)\static\background.png" KeyPath="yes" />   <File Id="static.coal.file.png" Source="$(var.SourceDir)\static\coal-file.png" />   <File Id="static.coal.folder.png" Source="$(var.SourceDir)\static\coal-folder.png" />