Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

wix: indentation and line wrapping changes

no semantic changes

Changeset 5889b25f5887…

Parent 6b58823e5c62…

by Adrian Buehlmann

Changes to 9 files · Browse files at 5889b25f5887 Showing diff from parent 6b58823e5c62 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​cmenu-i18n.wxs Stacked
 
1
2
3
4
 
5
6
7
 
 
 
 
8
9
10
11
12
13
14
15
16
17
18
19
20
 
 
 
 
 
 
 
 
 
 
 
 
 
21
 
1
2
3
 
4
5
 
 
6
7
8
9
10
 
 
 
 
 
 
 
 
 
 
 
 
11
12
13
14
15
16
17
18
19
20
21
22
23
24
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   - <?include thg-guids.wxi ?> + <?include thg-guids.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 ?> - <!-- lang 'ca' is used for key path --> + <?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 + ?> + <!-- lang 'ca' is used for key path -->   - <Fragment> - <DirectoryRef Id="i18ndir"> - <Directory Id="cmenuI18n" Name="cmenu"> - <Component Id="cmenuI18n" Guid="$(var.cmenuI18n.guid)"> - <File Source="$(var.SourceDir)\thg-cmenu-ca.reg" KeyPath="yes"/> - <?foreach LANG in $(var.thgcmenulangs) ?> - <File Source="$(var.SourceDir)\thg-cmenu-$(var.LANG).reg" /> - <?endforeach?> - </Component> - </Directory> - </DirectoryRef> - </Fragment> + <Fragment> + <DirectoryRef Id="i18ndir"> + <Directory Id="cmenuI18n" Name="cmenu"> + <Component Id="cmenuI18n" Guid="$(var.cmenuI18n.guid)"> + <File Source="$(var.SourceDir)\thg-cmenu-ca.reg" KeyPath="yes"/> + <?foreach LANG in $(var.thgcmenulangs) ?> + <File Source="$(var.SourceDir)\thg-cmenu-$(var.LANG).reg" /> + <?endforeach?> + </Component> + </Directory> + </DirectoryRef> + </Fragment> +  </Wix>
Change 1 of 1 Show Entire File contrib/​wix/​contrib.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
 
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
@@ -1,40 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   - <?include guids.wxi ?> + <?include guids.wxi ?>   - <Fragment> - <ComponentGroup Id="contribFolder"> - <ComponentRef Id="contrib" /> - <ComponentRef Id="contrib.vim" /> - </ComponentGroup> - </Fragment> - <Fragment> - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="contribdir" Name="contrib"> - <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" /> - <File Source="$(var.SourceDir)\hgwebdir.wsgi" /> - <File Source="$(var.SourceDir)\logo-droplets.svg" /> - <File Source="$(var.SourceDir)\mercurial.el" /> - <File Source="$(var.SourceDir)\sample.hgrc" /> - <File Source="$(var.SourceDir)\tcsh_completion" /> - <File Source="$(var.SourceDir)\tcsh_completion_build.sh" /> - <File Source="$(var.SourceDir)\xml.rnc" /> - <File Source="$(var.SourceDir)\zsh_completion" /> - </Component> - <Directory Id="vimdir" Name="vim"> - <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" /> - <File Source="$(var.SourceDir)\vim\patchreview.txt" /> - <File Source="$(var.SourceDir)\vim\patchreview.vim" /> - </Component> - </Directory> - </Directory> - </DirectoryRef> - </Fragment> + <Fragment> + <ComponentGroup Id="contribFolder"> + <ComponentRef Id="contrib" /> + <ComponentRef Id="contrib.vim" /> + </ComponentGroup> + </Fragment> + + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Directory Id="contribdir" Name="contrib"> + <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" /> + <File Source="$(var.SourceDir)\hgwebdir.wsgi" /> + <File Source="$(var.SourceDir)\logo-droplets.svg" /> + <File Source="$(var.SourceDir)\mercurial.el" /> + <File Source="$(var.SourceDir)\sample.hgrc" /> + <File Source="$(var.SourceDir)\tcsh_completion" /> + <File Source="$(var.SourceDir)\tcsh_completion_build.sh" /> + <File Source="$(var.SourceDir)\xml.rnc" /> + <File Source="$(var.SourceDir)\zsh_completion" /> + </Component> + <Directory Id="vimdir" Name="vim"> + <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" /> + <File Source="$(var.SourceDir)\vim\patchreview.txt" /> + <File Source="$(var.SourceDir)\vim\patchreview.vim" /> + </Component> + </Directory> + </Directory> + </DirectoryRef> + </Fragment> +  </Wix>
Change 1 of 1 Show Entire File contrib/​wix/​doc.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
 
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
@@ -1,47 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   - <?include guids.wxi ?> + <?include guids.wxi ?>   - <Fragment> - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="docdir" Name="doc" /> - </DirectoryRef> - </Fragment> - <Fragment> - <ComponentGroup Id="docFolder"> - <Component Id="doc.hg.1.html" Directory="docdir" - Guid="$(var.doc.hg.1.html.guid)" - > - <File Source="$(var.SourceDir)\hg.1.html" KeyPath="yes"> - <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir" - Name="Mercurial Command Reference" - Icon="hgIcon.ico" IconIndex="0" Advertise="yes" /> - </File> - </Component> - <Component Id="doc.hgignore.5.html" Directory="docdir" - Guid="$(var.doc.hgignore.5.html.guid)" - > - <File Source="$(var.SourceDir)\hgignore.5.html" KeyPath="yes"> - <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir" - Name="Mercurial Ignore Files" - Icon="hgIcon.ico" IconIndex="0" Advertise="yes" /> - </File> - </Component> - <Component Id="doc.hgrc.5.html" Directory="docdir" - Guid="$(var.doc.hgrc.5.html)" - > - <File Source="$(var.SourceDir)\hgrc.5.html" KeyPath="yes"> - <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir" - Name="Mercurial Configuration Files" - Icon="hgIcon.ico" IconIndex="0" Advertise="yes" /> - </File> - </Component> - <Component Id="doc.style.css" Directory="docdir" - Guid="$(var.doc.style.css)" - > - <File Source="$(var.SourceDir)\style.css" KeyPath="yes" /> - </Component> - </ComponentGroup> - </Fragment> + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Directory Id="docdir" Name="doc" /> + </DirectoryRef> + </Fragment> + + <Fragment> + <ComponentGroup Id="docFolder"> + <Component Id="doc.hg.1.html" Directory="docdir" + Guid="$(var.doc.hg.1.html.guid)" + > + <File Source="$(var.SourceDir)\hg.1.html" KeyPath="yes"> + <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir" + Name="Mercurial Command Reference" + Icon="hgIcon.ico" IconIndex="0" Advertise="yes" + /> + </File> + </Component> + <Component Id="doc.hgignore.5.html" Directory="docdir" + Guid="$(var.doc.hgignore.5.html.guid)" + > + <File Source="$(var.SourceDir)\hgignore.5.html" KeyPath="yes"> + <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir" + Name="Mercurial Ignore Files" + Icon="hgIcon.ico" IconIndex="0" Advertise="yes" + /> + </File> + </Component> + <Component Id="doc.hgrc.5.html" Directory="docdir" + Guid="$(var.doc.hgrc.5.html)" + > + <File Source="$(var.SourceDir)\hgrc.5.html" KeyPath="yes"> + <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir" + Name="Mercurial Configuration Files" + Icon="hgIcon.ico" IconIndex="0" Advertise="yes" + /> + </File> + </Component> + <Component Id="doc.style.css" Directory="docdir" + Guid="$(var.doc.style.css)" + > + <File Source="$(var.SourceDir)\style.css" KeyPath="yes" /> + </Component> + </ComponentGroup> + </Fragment> +  </Wix>
Change 1 of 1 Show Entire File contrib/​wix/​help.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
 
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
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   - <?include guids.wxi ?> + <?include guids.wxi ?>   - <Fragment> - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="helpdir" Name="help"> - <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" /> - <File Source="$(var.SourceDir)\environment.txt" /> - <File Source="$(var.SourceDir)\extensions.txt" /> - <File Source="$(var.SourceDir)\multirevs.txt" /> - <File Source="$(var.SourceDir)\patterns.txt" /> - <File Source="$(var.SourceDir)\revisions.txt" /> - <File Source="$(var.SourceDir)\templates.txt" /> - <File Source="$(var.SourceDir)\urls.txt" /> - </Component> - </Directory> - </DirectoryRef> - </Fragment> + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Directory Id="helpdir" Name="help"> + <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" /> + <File Source="$(var.SourceDir)\environment.txt" /> + <File Source="$(var.SourceDir)\extensions.txt" /> + <File Source="$(var.SourceDir)\multirevs.txt" /> + <File Source="$(var.SourceDir)\patterns.txt" /> + <File Source="$(var.SourceDir)\revisions.txt" /> + <File Source="$(var.SourceDir)\templates.txt" /> + <File Source="$(var.SourceDir)\urls.txt" /> + </Component> + </Directory> + </DirectoryRef> + </Fragment> +  </Wix>
Change 1 of 1 Show Entire File contrib/​wix/​i18n.wxs Stacked
 
1
2
3
4
 
5
6
 
 
 
7
8
9
10
11
12
13
14
15
16
17
18
19
 
 
 
 
 
 
 
 
 
 
 
 
 
 
20
21
 
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
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   - <?include guids.wxi ?> + <?include guids.wxi ?>   - <?define hg_po_langs = da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW ?> + <?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="$(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" /> - <?endforeach?> - </Component> - </Directory> - </DirectoryRef> - </Fragment> + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Directory Id="i18ndir" Name="i18n"> + <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" + /> + <?endforeach?> + </Component> + </Directory> + </DirectoryRef> + </Fragment>    </Wix>
Change 1 of 1 Show Entire File contrib/​wix/​icons.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
67
68
69
70
71
72
73
74
75
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
76
 
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
@@ -1,76 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <Fragment> - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="IconsDirectory" Name="icons"> - <Component Id='Icons' Guid='{30E997E7-FB02-4d34-AF61-A6FD6C93E268}'> - <File Source="$(var.SourceDir)\branch.ico" KeyPath="yes" /> - <File Source="$(var.SourceDir)\detect_rename.ico" /> - <File Source="$(var.SourceDir)\fileadd.ico" /> - <File Source="$(var.SourceDir)\filedelete.ico" /> - <File Source="$(var.SourceDir)\filemodify.ico" /> - <File Source="$(var.SourceDir)\general.ico" /> - <File Source="$(var.SourceDir)\hg.ico" /> - <File Source="$(var.SourceDir)\hg_60.ico" /> - <File Source="$(var.SourceDir)\hgB.ico" /> - <File Source="$(var.SourceDir)\ignore.ico" /> - <File Source="$(var.SourceDir)\menuabout.ico" /> - <File Source="$(var.SourceDir)\menuadd.ico" /> - <File Source="$(var.SourceDir)\menublame.ico" /> - <File Source="$(var.SourceDir)\menucheckout.ico" /> - <File Source="$(var.SourceDir)\menuclone.ico" /> - <File Source="$(var.SourceDir)\menucommit.ico" /> - <File Source="$(var.SourceDir)\menucreaterepos.ico" /> - <File Source="$(var.SourceDir)\menudelete.ico" /> - <File Source="$(var.SourceDir)\menudiff.ico" /> - <File Source="$(var.SourceDir)\menuhelp.ico" /> - <File Source="$(var.SourceDir)\menuimport.ico" /> - <File Source="$(var.SourceDir)\menulog.ico" /> - <File Source="$(var.SourceDir)\menumerge.ico" /> - <File Source="$(var.SourceDir)\menupatch.ico" /> - <File Source="$(var.SourceDir)\menurelocate.ico" /> - <File Source="$(var.SourceDir)\menurepobrowse.ico" /> - <File Source="$(var.SourceDir)\menurevert.ico" /> - <File Source="$(var.SourceDir)\menurevisiongraph.ico" /> - <File Source="$(var.SourceDir)\menusettings.ico" /> - <File Source="$(var.SourceDir)\menushowchanged.ico" /> - <File Source="$(var.SourceDir)\menusynch.ico" /> - <File Source="$(var.SourceDir)\menuunmerge.ico" /> - <File Source="$(var.SourceDir)\proxy.ico" /> - <File Source="$(var.SourceDir)\python.ico" /> - <File Source="$(var.SourceDir)\README.txt" /> - <File Source="$(var.SourceDir)\refresh_overlays.ico" /> - <File Source="$(var.SourceDir)\settings_repo.ico" /> - <File Source="$(var.SourceDir)\settings_user.ico" /> - <File Source="$(var.SourceDir)\shelve.ico" /> - <File Source="$(var.SourceDir)\thg_logo.ico" /> - <File Source="$(var.SourceDir)\thg_logo_92x50.png" /> - <File Source="$(var.SourceDir)\TortoiseMerge.ico" /> - </Component> - <Directory Id="SvgDirectory" Name="svg"> - <Component Id='SvgIcons' Guid='{7C87CCC7-8377-49c8-ACFD-1F246ED14747}'> - <File Source="$(var.SourceDir)\svg\add.svg" KeyPath="yes" /> - <File Source="$(var.SourceDir)\svg\checkout.svg" /> - <File Source="$(var.SourceDir)\svg\clone.svg" /> - <File Source="$(var.SourceDir)\svg\commit.svg" /> - <File Source="$(var.SourceDir)\svg\detect_rename.svg" /> - <File Source="$(var.SourceDir)\svg\ignore.svg" /> - <File Source="$(var.SourceDir)\svg\init.svg" /> - <File Source="$(var.SourceDir)\svg\log.svg" /> - <File Source="$(var.SourceDir)\svg\merge.svg" /> - <File Source="$(var.SourceDir)\svg\proxy.svg" /> - <File Source="$(var.SourceDir)\svg\recovery.svg" /> - <File Source="$(var.SourceDir)\svg\refresh_overlays.svg" /> - <File Source="$(var.SourceDir)\svg\remove.svg" /> - <File Source="$(var.SourceDir)\svg\repobrowse.svg" /> - <File Source="$(var.SourceDir)\svg\revert.svg" /> - <File Source="$(var.SourceDir)\svg\shelve.svg" /> - <File Source="$(var.SourceDir)\svg\status.svg" /> - <File Source="$(var.SourceDir)\svg\sync.svg" /> - <File Source="$(var.SourceDir)\svg\thg_logo.svg" /> - </Component> - </Directory> - </Directory> - </DirectoryRef> - </Fragment> + + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + + <Directory Id="IconsDirectory" Name="icons"> + + <Component Id='Icons' Guid='{30E997E7-FB02-4d34-AF61-A6FD6C93E268}'> + <File Source="$(var.SourceDir)\branch.ico" KeyPath="yes" /> + <File Source="$(var.SourceDir)\detect_rename.ico" /> + <File Source="$(var.SourceDir)\fileadd.ico" /> + <File Source="$(var.SourceDir)\filedelete.ico" /> + <File Source="$(var.SourceDir)\filemodify.ico" /> + <File Source="$(var.SourceDir)\general.ico" /> + <File Source="$(var.SourceDir)\hg.ico" /> + <File Source="$(var.SourceDir)\hg_60.ico" /> + <File Source="$(var.SourceDir)\hgB.ico" /> + <File Source="$(var.SourceDir)\ignore.ico" /> + <File Source="$(var.SourceDir)\menuabout.ico" /> + <File Source="$(var.SourceDir)\menuadd.ico" /> + <File Source="$(var.SourceDir)\menublame.ico" /> + <File Source="$(var.SourceDir)\menucheckout.ico" /> + <File Source="$(var.SourceDir)\menuclone.ico" /> + <File Source="$(var.SourceDir)\menucommit.ico" /> + <File Source="$(var.SourceDir)\menucreaterepos.ico" /> + <File Source="$(var.SourceDir)\menudelete.ico" /> + <File Source="$(var.SourceDir)\menudiff.ico" /> + <File Source="$(var.SourceDir)\menuhelp.ico" /> + <File Source="$(var.SourceDir)\menuimport.ico" /> + <File Source="$(var.SourceDir)\menulog.ico" /> + <File Source="$(var.SourceDir)\menumerge.ico" /> + <File Source="$(var.SourceDir)\menupatch.ico" /> + <File Source="$(var.SourceDir)\menurelocate.ico" /> + <File Source="$(var.SourceDir)\menurepobrowse.ico" /> + <File Source="$(var.SourceDir)\menurevert.ico" /> + <File Source="$(var.SourceDir)\menurevisiongraph.ico" /> + <File Source="$(var.SourceDir)\menusettings.ico" /> + <File Source="$(var.SourceDir)\menushowchanged.ico" /> + <File Source="$(var.SourceDir)\menusynch.ico" /> + <File Source="$(var.SourceDir)\menuunmerge.ico" /> + <File Source="$(var.SourceDir)\proxy.ico" /> + <File Source="$(var.SourceDir)\python.ico" /> + <File Source="$(var.SourceDir)\README.txt" /> + <File Source="$(var.SourceDir)\refresh_overlays.ico" /> + <File Source="$(var.SourceDir)\settings_repo.ico" /> + <File Source="$(var.SourceDir)\settings_user.ico" /> + <File Source="$(var.SourceDir)\shelve.ico" /> + <File Source="$(var.SourceDir)\thg_logo.ico" /> + <File Source="$(var.SourceDir)\thg_logo_92x50.png" /> + <File Source="$(var.SourceDir)\TortoiseMerge.ico" /> + </Component> + + <Directory Id="SvgDirectory" Name="svg"> + <Component Id='SvgIcons' Guid='{7C87CCC7-8377-49c8-ACFD-1F246ED14747}'> + <File Source="$(var.SourceDir)\svg\add.svg" KeyPath="yes" /> + <File Source="$(var.SourceDir)\svg\checkout.svg" /> + <File Source="$(var.SourceDir)\svg\clone.svg" /> + <File Source="$(var.SourceDir)\svg\commit.svg" /> + <File Source="$(var.SourceDir)\svg\detect_rename.svg" /> + <File Source="$(var.SourceDir)\svg\ignore.svg" /> + <File Source="$(var.SourceDir)\svg\init.svg" /> + <File Source="$(var.SourceDir)\svg\log.svg" /> + <File Source="$(var.SourceDir)\svg\merge.svg" /> + <File Source="$(var.SourceDir)\svg\proxy.svg" /> + <File Source="$(var.SourceDir)\svg\recovery.svg" /> + <File Source="$(var.SourceDir)\svg\refresh_overlays.svg" /> + <File Source="$(var.SourceDir)\svg\remove.svg" /> + <File Source="$(var.SourceDir)\svg\repobrowse.svg" /> + <File Source="$(var.SourceDir)\svg\revert.svg" /> + <File Source="$(var.SourceDir)\svg\shelve.svg" /> + <File Source="$(var.SourceDir)\svg\status.svg" /> + <File Source="$(var.SourceDir)\svg\sync.svg" /> + <File Source="$(var.SourceDir)\svg\thg_logo.svg" /> + </Component> + + </Directory> + + </Directory> + + </DirectoryRef> + </Fragment> +  </Wix>
Change 1 of 1 Show Entire File contrib/​wix/​locale.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
 
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
@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   - <?define hglocales = da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW ?> + <?define hglocales = + da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW + ?>   + <Fragment> + <ComponentGroup Id="localeFolder"> + <?foreach LOC in $(var.hglocales) ?> + <ComponentRef Id="hg.locale.$(var.LOC)"/> + <?endforeach?> + </ComponentGroup> + </Fragment> + + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Directory Id="localedir" Name="locale" /> + </DirectoryRef> + </Fragment> + + <?foreach LOC in $(var.hglocales) ?>   <Fragment> - <ComponentGroup Id="localeFolder"> - <?foreach LOC in $(var.hglocales) ?> - <ComponentRef Id="hg.locale.$(var.LOC)"/> - <?endforeach?> - </ComponentGroup> + <DirectoryRef Id="localedir"> + <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="*"> + <File Id="hg.mo.$(var.LOC)" KeyPath="yes" + Source="$(var.SourceDir)\$(var.LOC)\LC_MESSAGES\hg.mo" + /> + </Component> + </Directory> + </Directory> + </DirectoryRef>   </Fragment> - - <Fragment> - <DirectoryRef Id="INSTALLDIR"> - <Directory Id="localedir" Name="locale" /> - </DirectoryRef> - </Fragment> - - <?foreach LOC in $(var.hglocales) ?> - <Fragment> - <DirectoryRef Id="localedir"> - <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="*"> - <File Id="hg.mo.$(var.LOC)" KeyPath="yes" - Source="$(var.SourceDir)\$(var.LOC)\LC_MESSAGES\hg.mo" - /> - </Component> - </Directory> - </Directory> - </DirectoryRef> - </Fragment> - <?endforeach?> + <?endforeach?>    </Wix>
Change 1 of 1 Show Entire File contrib/​wix/​thg-i18n.wxs Stacked
 
1
2
3
4
 
5
6
7
 
 
 
 
8
9
10
11
12
13
14
15
16
17
18
19
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
 
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
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">   - <?include thg-guids.wxi ?> + <?include thg-guids.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 ?> - <!-- lang 'ca' is used for key path --> + <?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 + ?> + <!-- lang 'ca' is used for key path -->   - <Fragment> - <DirectoryRef Id="i18ndir"> - <Directory Id="thgI18nFolder" Name="tortoisehg"> - <Component Id="thgI18nFolder" Guid="$(var.thgI18nFolder.guid)"> - <File Id="thg.ca.po" Source="$(var.SourceDir)\tortoisehg\ca.po" KeyPath="yes" /> - <?foreach LANG in $(var.thg_po_langs) ?> - <File Id="thg.$(var.LANG).po" Source="$(var.SourceDir)\tortoisehg\$(var.LANG).po" /> - <?endforeach?> - </Component> - </Directory> - </DirectoryRef> - </Fragment> + <Fragment> + <DirectoryRef Id="i18ndir"> + <Directory Id="thgI18nFolder" Name="tortoisehg"> + <Component Id="thgI18nFolder" Guid="$(var.thgI18nFolder.guid)"> + <File Id="thg.ca.po" Source="$(var.SourceDir)\tortoisehg\ca.po" KeyPath="yes" /> + <?foreach LANG in $(var.thg_po_langs) ?> + <File Id="thg.$(var.LANG).po" + Source="$(var.SourceDir)\tortoisehg\$(var.LANG).po" + /> + <?endforeach?> + </Component> + </Directory> + </DirectoryRef> + </Fragment> +  </Wix>
Change 1 of 1 Show Entire File contrib/​wix/​thg-locale.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
 
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
@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?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 ?> + + <?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 + ?> + + <Fragment> + <ComponentGroup Id="thgLocaleFolder"> + <?foreach LOC in $(var.thglocales) ?> + <ComponentRef Id="thg.locale.$(var.LOC)"/> + <?endforeach?> + </ComponentGroup> + </Fragment> + + <?foreach LOC in $(var.thglocales) ?>   <Fragment> - <ComponentGroup Id="thgLocaleFolder"> - <?foreach LOC in $(var.thglocales) ?> - <ComponentRef Id="thg.locale.$(var.LOC)"/> - <?endforeach?> - </ComponentGroup> + <DirectoryRef Id="localedir"> + <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="*"> + <File Id="tortoisehg.mo.$(var.LOC)" KeyPath="yes" + Source="$(var.SourceDir)\$(var.LOC)\LC_MESSAGES\tortoisehg.mo" + /> + </Component> + </Directory> + </Directory> + </DirectoryRef>   </Fragment> - <?foreach LOC in $(var.thglocales) ?> - <Fragment> - <DirectoryRef Id="localedir"> - <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="*"> - <File Id="tortoisehg.mo.$(var.LOC)" KeyPath="yes" - Source="$(var.SourceDir)\$(var.LOC)\LC_MESSAGES\tortoisehg.mo" - /> - </Component> - </Directory> - </Directory> - </DirectoryRef> - </Fragment> - <?endforeach?> + <?endforeach?> +  </Wix>