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

wix: use FileSource in locale.wxs and doc.wxs

Changeset 70395d283d3b…

Parent 0129389e83c3…

by Adrian Buehlmann

Changes to 2 files · Browse files at 70395d283d3b Showing diff from parent 0129389e83c3 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​doc.wxs Stacked
 
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
 
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
@@ -4,49 +4,46 @@
  <?include guids.wxi ?>     <Fragment> + <ComponentGroup Id="docFolder"> + <ComponentRef Id="doc.hg.1.html" /> + <ComponentRef Id="doc.hgignore.5.html" /> + <ComponentRef Id="doc.hgrc.5.html" /> + <ComponentRef Id="doc.style.css" /> + </ComponentGroup> + </Fragment> + + <Fragment>   <DirectoryRef Id="INSTALLDIR"> - <Directory Id="docdir" Name="doc" /> + <Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)"> + <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)"> + <File Name="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" Guid="$(var.doc.hgignore.5.html.guid)"> + <File Name="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" Guid="$(var.doc.hgrc.5.html)"> + <File Name="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" Guid="$(var.doc.style.css)"> + <File Name="style.css" KeyPath="yes" /> + </Component> + </Directory>   </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/​locale.wxs Stacked
 
15
16
17
18
 
 
 
 
 
 
 
 
 
 
 
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
 
15
16
17
 
18
19
20
21
22
23
24
25
26
27
28
29
30
31
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
32
@@ -15,24 +15,18 @@
    <Fragment>   <DirectoryRef Id="INSTALLDIR"> - <Directory Id="localedir" Name="locale" /> + <Directory Id="localedir" Name="locale" FileSource="$(var.SourceDir)"> + <?foreach LOC in $(var.hglocales) ?> + <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)" Name="hg.mo" KeyPath="yes" /> + </Component> + </Directory> + </Directory> + <?endforeach?> + </Directory>   </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?> -  </Wix>