wix updates
- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi
--- a/contrib/wix/doc.wxs Fri Apr 16 01:58:14 2010 +0200
+++ b/contrib/wix/doc.wxs Fri Apr 16 14:57:30 2010 +0200
@@ -4,49 +4,46 @@
<?include guids.wxi ?>
<Fragment>
- <DirectoryRef Id="INSTALLDIR">
- <Directory Id="docdir" Name="doc" />
- </DirectoryRef>
+ <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>
- <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>
+ <DirectoryRef Id="INSTALLDIR">
+ <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>
</Wix>
--- a/contrib/wix/guids.wxi Fri Apr 16 01:58:14 2010 +0200
+++ b/contrib/wix/guids.wxi Fri Apr 16 14:57:30 2010 +0200
@@ -32,4 +32,15 @@
<?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
<?define templates.static.guid = {68C9F843-DE7E-480f-9DA2-D220B19D02C3} ?>
+ <!-- mercurial.wxs -->
+ <?define ProductUpgradeCode = {A1CC6134-E945-4399-BE36-EB0017FDF7CF} ?>
+
+ <?define ComponentMainExecutableGUID = {D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF} ?>
+
+ <?define ReadMe.guid = {56A8E372-991D-4DCA-B91D-93D775974CF5} ?>
+ <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?>
+ <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?>
+ <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?>
+ <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
+
</Include>
--- a/contrib/wix/locale.wxs Fri Apr 16 01:58:14 2010 +0200
+++ b/contrib/wix/locale.wxs Fri Apr 16 14:57:30 2010 +0200
@@ -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>
--- a/contrib/wix/mercurial.wxs Fri Apr 16 01:58:14 2010 +0200
+++ b/contrib/wix/mercurial.wxs Fri Apr 16 14:57:30 2010 +0200
@@ -6,24 +6,31 @@
This software may be used and distributed according to the terms of the
GNU General Public License version 2 or any later version. -->
- <?define ComponentMainExecutableGUID = D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF ?>
- <?define ProductUpgradeCode = A1CC6134-E945-4399-BE36-EB0017FDF7CF ?>
+ <?include guids.wxi ?>
- <Product Name='Mercurial $(var.Version)' Id='*'
+ <Product Id='*'
+ Name='Mercurial $(var.Version)'
UpgradeCode='$(var.ProductUpgradeCode)'
- Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Matt Mackall and others.'>
+ Language='1033' Codepage='1252' Version='$(var.Version)'
+ Manufacturer='Matt Mackall and others'>
- <Package Id='*' Keywords='Installer' Description="Mercurial distributed SCM (version $(var.Version))"
- Comments='$(var.Comments)' Manufacturer='Matt Mackall and others.'
+ <Package Id='*'
+ Keywords='Installer'
+ Description="Mercurial distributed SCM (version $(var.Version))"
+ Comments='$(var.Comments)'
+ Manufacturer='Matt Mackall and others'
InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
- <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' CompressionLevel='high' />
+ <Media Id='1' Cabinet='mercurial.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'
+ CompressionLevel='high' />
<Property Id='DiskPrompt' Value="Mercurial $(var.Version) Installation [1]" />
- <Condition Message='Mercurial requires Windows XP or higher'>VersionNT >= 501</Condition>
+ <Condition Message='Mercurial requires Windows XP or higher'
+ >VersionNT >= 501</Condition>
<Property Id="INSTALLDIR">
- <ComponentSearch Id='SearchForMainExecutableComponent' Guid='$(var.ComponentMainExecutableGUID)' />
+ <ComponentSearch Id='SearchForMainExecutableComponent'
+ Guid='$(var.ComponentMainExecutableGUID)' />
</Property>
<!--Property Id='ARPCOMMENTS'>any comments</Property-->
@@ -44,26 +51,28 @@
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<Directory Id='INSTALLDIR' Name='Mercurial'>
<Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)'>
- <File Id='hgEXE' Name='hg.exe' DiskId='1' Source='dist\hg.exe' KeyPath='yes' />
- <File Id='libraryZIP' Name='library.zip' DiskId='1' Source='dist\library.zip' />
- <File Id='pythonDLL' Name='python26.dll' DiskId='1' Source='dist\python26.dll' />
+ <File Id='hgEXE' Name='hg.exe' Source='dist\hg.exe' KeyPath='yes' />
+ <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" />
</Component>
- <Component Id='ReadMe' Guid='56A8E372-991D-4DCA-B91D-93D775974CF5'>
- <File Id='ReadMe' Name='ReadMe.html' DiskId='1' Source='contrib\win32\ReadMe.html' KeyPath='yes'/>
+ <Component Id='ReadMe' Guid='$(var.ReadMe.guid)'>
+ <File Id='ReadMe' Name='ReadMe.html' Source='contrib\win32\ReadMe.html'
+ KeyPath='yes'/>
</Component>
- <Component Id='COPYING' Guid='B7801DBA-1C49-4BF4-91AD-33C65F5C7895'>
- <File Id='COPYING' Name='COPYING.rtf' DiskId='1' Source='contrib\wix\COPYING.rtf' />
+ <Component Id='COPYING' Guid='$(var.COPYING.guid)'>
+ <File Id='COPYING' Name='COPYING.rtf' Source='contrib\wix\COPYING.rtf'
+ KeyPath='yes'/>
</Component>
<Directory Id='HGRCD' Name='hgrc.d'>
- <Component Id='mercurial.rc' Guid='1D5FAEEE-7E6E-43B1-9F7F-802714316B15'>
- <File Id='mercurial.rc' Name='Mercurial.rc' DiskId='1' Source='contrib\win32\mercurial.ini'
- ReadOnly='yes'/>
+ <Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)'>
+ <File Id='mercurial.rc' Name='Mercurial.rc' Source='contrib\win32\mercurial.ini'
+ ReadOnly='yes' KeyPath='yes'/>
</Component>
- <Component Id='mergetools.rc' Guid='E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD'>
- <File Id='mergetools.rc' Name='MergeTools.rc' DiskId='1' Source='contrib\mergetools.hgrc'
- ReadOnly='yes'/>
+ <Component Id='mergetools.rc' Guid='$(var.mergetools.rc.guid)'>
+ <File Id='mergetools.rc' Name='MergeTools.rc' Source='contrib\mergetools.hgrc'
+ ReadOnly='yes' KeyPath='yes'/>
</Component>
</Directory>
</Directory>
@@ -71,17 +80,16 @@
<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name="Mercurial $(var.Version)">
- <Component Id="ProgramMenuDir" Guid="D5A63320-1238-489B-B68B-CF053E9577CA">
+ <Component Id="ProgramMenuDir" Guid="$(var.ProgramMenuDir.guid)">
<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
<RegistryValue Root='HKCU' Key='Software\Mercurial\InstallDir' Type='string'
Value='[INSTALLDIR]' KeyPath='yes' />
- <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site' Target='[ARPHELPLINK]'
- Icon="hgIcon.ico" IconIndex='0' />
+ <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='Mercurial Web Site'
+ Target='[ARPHELPLINK]' Icon="hgIcon.ico" IconIndex='0' />
</Component>
</Directory>
</Directory>
- <Directory Id="DesktopFolder" Name="Desktop" />
<Merge Id='VCRuntime' DiskId='1' Language='1033'
SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' />
<Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'