Mercurial > hg
diff contrib/wix/doc.wxs @ 10930:230ab9a23594
wix updates
- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 16 Apr 2010 14:57:30 +0200 |
parents | 1aa9464ce9ae |
children | bd9bc4123920 |
line wrap: on
line diff
--- 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>