Mercurial > hg
diff contrib/wix/mercurial.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 | 79388a8325dc |
line wrap: on
line diff
--- 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'