##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

wix updates...
Adrian Buehlmann -
r10930:230ab9a2 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -4,49 +4,46 b''
4 4 <?include guids.wxi ?>
5 5
6 6 <Fragment>
7 <DirectoryRef Id="INSTALLDIR">
8 <Directory Id="docdir" Name="doc" />
9 </DirectoryRef>
7 <ComponentGroup Id="docFolder">
8 <ComponentRef Id="doc.hg.1.html" />
9 <ComponentRef Id="doc.hgignore.5.html" />
10 <ComponentRef Id="doc.hgrc.5.html" />
11 <ComponentRef Id="doc.style.css" />
12 </ComponentGroup>
10 13 </Fragment>
11 14
12 15 <Fragment>
13 <ComponentGroup Id="docFolder">
14 <Component Id="doc.hg.1.html" Directory="docdir"
15 Guid="$(var.doc.hg.1.html.guid)"
16 >
17 <File Source="$(var.SourceDir)\hg.1.html" KeyPath="yes">
16 <DirectoryRef Id="INSTALLDIR">
17 <Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)">
18 <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)">
19 <File Name="hg.1.html" KeyPath="yes">
18 20 <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir"
19 21 Name="Mercurial Command Reference"
20 22 Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
21 23 />
22 24 </File>
23 25 </Component>
24 <Component Id="doc.hgignore.5.html" Directory="docdir"
25 Guid="$(var.doc.hgignore.5.html.guid)"
26 >
27 <File Source="$(var.SourceDir)\hgignore.5.html" KeyPath="yes">
26 <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)">
27 <File Name="hgignore.5.html" KeyPath="yes">
28 28 <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir"
29 29 Name="Mercurial Ignore Files"
30 30 Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
31 31 />
32 32 </File>
33 33 </Component>
34 <Component Id="doc.hgrc.5.html" Directory="docdir"
35 Guid="$(var.doc.hgrc.5.html)"
36 >
37 <File Source="$(var.SourceDir)\hgrc.5.html" KeyPath="yes">
34 <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)">
35 <File Name="hgrc.5.html" KeyPath="yes">
38 36 <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir"
39 37 Name="Mercurial Configuration Files"
40 38 Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
41 39 />
42 40 </File>
43 41 </Component>
44 <Component Id="doc.style.css" Directory="docdir"
45 Guid="$(var.doc.style.css)"
46 >
47 <File Source="$(var.SourceDir)\style.css" KeyPath="yes" />
42 <Component Id="doc.style.css" Guid="$(var.doc.style.css)">
43 <File Name="style.css" KeyPath="yes" />
48 44 </Component>
49 </ComponentGroup>
45 </Directory>
46 </DirectoryRef>
50 47 </Fragment>
51 48
52 49 </Wix>
Show file before | Show file after | Hide comments
@@ -32,4 +32,15 b''
32 32 <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
33 33 <?define templates.static.guid = {68C9F843-DE7E-480f-9DA2-D220B19D02C3} ?>
34 34
35 <!-- mercurial.wxs -->
36 <?define ProductUpgradeCode = {A1CC6134-E945-4399-BE36-EB0017FDF7CF} ?>
37
38 <?define ComponentMainExecutableGUID = {D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF} ?>
39
40 <?define ReadMe.guid = {56A8E372-991D-4DCA-B91D-93D775974CF5} ?>
41 <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?>
42 <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?>
43 <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?>
44 <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
45
35 46 </Include>
Show file before | Show file after | Hide comments
@@ -15,24 +15,18 b''
15 15
16 16 <Fragment>
17 17 <DirectoryRef Id="INSTALLDIR">
18 <Directory Id="localedir" Name="locale" />
19 </DirectoryRef>
20 </Fragment>
21
18 <Directory Id="localedir" Name="locale" FileSource="$(var.SourceDir)">
22 19 <?foreach LOC in $(var.hglocales) ?>
23 <Fragment>
24 <DirectoryRef Id="localedir">
25 20 <Directory Id="hg.locale.$(var.LOC)" Name="$(var.LOC)">
26 21 <Directory Id="hg.locale.$(var.LOC).LC_MESSAGES" Name="LC_MESSAGES">
27 22 <Component Id="hg.locale.$(var.LOC)" Guid="*">
28 <File Id="hg.mo.$(var.LOC)" KeyPath="yes"
29 Source="$(var.SourceDir)\$(var.LOC)\LC_MESSAGES\hg.mo"
30 />
23 <File Id="hg.mo.$(var.LOC)" Name="hg.mo" KeyPath="yes" />
31 24 </Component>
32 25 </Directory>
33 26 </Directory>
27 <?endforeach?>
28 </Directory>
34 29 </DirectoryRef>
35 30 </Fragment>
36 <?endforeach?>
37 31
38 32 </Wix>
Show file before | Show file after | Hide comments
@@ -6,24 +6,31 b''
6 6 This software may be used and distributed according to the terms of the
7 7 GNU General Public License version 2 or any later version. -->
8 8
9 <?define ComponentMainExecutableGUID = D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF ?>
10 <?define ProductUpgradeCode = A1CC6134-E945-4399-BE36-EB0017FDF7CF ?>
9 <?include guids.wxi ?>
11 10
12 <Product Name='Mercurial $(var.Version)' Id='*'
11 <Product Id='*'
12 Name='Mercurial $(var.Version)'
13 13 UpgradeCode='$(var.ProductUpgradeCode)'
14 Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Matt Mackall and others.'>
14 Language='1033' Codepage='1252' Version='$(var.Version)'
15 Manufacturer='Matt Mackall and others'>
15 16
16 <Package Id='*' Keywords='Installer' Description="Mercurial distributed SCM (version $(var.Version))"
17 Comments='$(var.Comments)' Manufacturer='Matt Mackall and others.'
17 <Package Id='*'
18 Keywords='Installer'
19 Description="Mercurial distributed SCM (version $(var.Version))"
20 Comments='$(var.Comments)'
21 Manufacturer='Matt Mackall and others'
18 22 InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
19 23
20 <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' CompressionLevel='high' />
24 <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'
25 CompressionLevel='high' />
21 26 <Property Id='DiskPrompt' Value="Mercurial $(var.Version) Installation [1]" />
22 27
23 <Condition Message='Mercurial requires Windows XP or higher'>VersionNT >= 501</Condition>
28 <Condition Message='Mercurial requires Windows XP or higher'
29 >VersionNT >= 501</Condition>
24 30
25 31 <Property Id="INSTALLDIR">
26 <ComponentSearch Id='SearchForMainExecutableComponent' Guid='$(var.ComponentMainExecutableGUID)' />
32 <ComponentSearch Id='SearchForMainExecutableComponent'
33 Guid='$(var.ComponentMainExecutableGUID)' />
27 34 </Property>
28 35
29 36 <!--Property Id='ARPCOMMENTS'>any comments</Property-->
@@ -44,26 +51,28 b''
44 51 <Directory Id='ProgramFilesFolder' Name='PFiles'>
45 52 <Directory Id='INSTALLDIR' Name='Mercurial'>
46 53 <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)'>
47 <File Id='hgEXE' Name='hg.exe' DiskId='1' Source='dist\hg.exe' KeyPath='yes' />
48 <File Id='libraryZIP' Name='library.zip' DiskId='1' Source='dist\library.zip' />
49 <File Id='pythonDLL' Name='python26.dll' DiskId='1' Source='dist\python26.dll' />
54 <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' />
55 <File Id='libraryZIP' Name='library.zip' Source='dist\library.zip' />
56 <File Id='pythonDLL' Name='python26.dll' Source='dist\python26.dll' />
50 57 <Environment Id="Environment" Name="PATH" Part="last" System="yes"
51 58 Permanent="no" Value="[INSTALLDIR]" Action="set" />
52 59 </Component>
53 <Component Id='ReadMe' Guid='56A8E372-991D-4DCA-B91D-93D775974CF5'>
54 <File Id='ReadMe' Name='ReadMe.html' DiskId='1' Source='contrib\win32\ReadMe.html' KeyPath='yes'/>
60 <Component Id='ReadMe' Guid='$(var.ReadMe.guid)'>
61 <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html'
62 KeyPath='yes'/>
55 63 </Component>
56 <Component Id='COPYING' Guid='B7801DBA-1C49-4BF4-91AD-33C65F5C7895'>
57 <File Id='COPYING' Name='COPYING.rtf' DiskId='1' Source='contrib\wix\COPYING.rtf' />
64 <Component Id='COPYING' Guid='$(var.COPYING.guid)'>
65 <File Id='COPYING' Name='COPYING.rtf' Source='contrib\wix\COPYING.rtf'
66 KeyPath='yes'/>
58 67 </Component>
59 68 <Directory Id='HGRCD' Name='hgrc.d'>
60 <Component Id='mercurial.rc' Guid='1D5FAEEE-7E6E-43B1-9F7F-802714316B15'>
61 <File Id='mercurial.rc' Name='Mercurial.rc' DiskId='1' Source='contrib\win32\mercurial.ini'
62 ReadOnly='yes'/>
69 <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)'>
70 <File Id='mercurial.rc' Name='Mercurial.rc' Source='contrib\win32\mercurial.ini'
71 ReadOnly='yes' KeyPath='yes'/>
63 72 </Component>
64 <Component Id='mergetools.rc' Guid='E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD'>
65 <File Id='mergetools.rc' Name='MergeTools.rc' DiskId='1' Source='contrib\mergetools.hgrc'
66 ReadOnly='yes'/>
73 <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)'>
74 <File Id='mergetools.rc' Name='MergeTools.rc' Source='contrib\mergetools.hgrc'
75 ReadOnly='yes' KeyPath='yes'/>
67 76 </Component>
68 77 </Directory>
69 78 </Directory>
@@ -71,17 +80,16 b''
71 80
72 81 <Directory Id="ProgramMenuFolder" Name="Programs">
73 82 <Directory Id="ProgramMenuDir" Name="Mercurial $(var.Version)">
74 <Component Id="ProgramMenuDir" Guid="D5A63320-1238-489B-B68B-CF053E9577CA">
83 <Component Id="ProgramMenuDir" Guid="$(var.ProgramMenuDir.guid)">
75 84 <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
76 85 <RegistryValue Root='HKCU' Key='Software\Mercurial\InstallDir' Type='string'
77 86 Value='[INSTALLDIR]' KeyPath='yes' />
78 <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site' Target='[ARPHELPLINK]'
79 Icon="hgIcon.ico" IconIndex='0' />
87 <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site'
88 Target='[ARPHELPLINK]' Icon="hgIcon.ico" IconIndex='0' />
80 89 </Component>
81 90 </Directory>
82 91 </Directory>
83 92
84 <Directory Id="DesktopFolder" Name="Desktop" />
85 93 <Merge Id='VCRuntime' DiskId='1' Language='1033'
86 94 SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' />
87 95 <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
General Comments 0
You need to be logged in to leave comments. Login now