contrib/wix: add COPYING.rtf stable
authorAdrian Buehlmann <adrian@cadifra.com>
Thu, 25 Feb 2010 14:56:09 +0100
branchstable
changeset 10552 cc9f16a1f545
parent 10551 f61dced1367a
child 10553 4462760d6cfc
contrib/wix: add COPYING.rtf Moving the file from the misc directory of the thg-winbuild repo, which uses mercurial's contrib/wix. This file is displayed by the install UI sequence, so it belongs to the WiX sources quite closely. It happens to be installed by the msi installer, too.
contrib/wix/COPYING.rtf
contrib/wix/mercurial.wxs
Binary file contrib/wix/COPYING.rtf has changed
--- a/contrib/wix/mercurial.wxs	Fri Feb 26 16:52:43 2010 +0100
+++ b/contrib/wix/mercurial.wxs	Thu Feb 25 14:56:09 2010 +0100
@@ -51,7 +51,7 @@
               <File Id='ReadMe' Name='ReadMe.html' DiskId='1' 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='..\misc\COPYING.rtf' />
+            <File Id='COPYING' Name='COPYING.rtf' DiskId='1' Source='contrib\wix\COPYING.rtf' />
           </Component>
           <Directory Id='HGRCD' Name='hgrc.d'>
             <Component Id='mercurial.rc' Guid='1D5FAEEE-7E6E-43B1-9F7F-802714316B15'>
@@ -115,7 +115,7 @@
     <UIRef Id="WixUI_FeatureTree" />
     <UIRef Id="WixUI_ErrorProgressText" />
 
-    <WixVariable Id="WixUILicenseRtf" Value="..\misc\COPYING.rtf" />
+    <WixVariable Id="WixUILicenseRtf" Value="contrib\wix\COPYING.rtf" />
 
     <Icon Id="hgIcon.ico" SourceFile="contrib/win32/mercurial.ico" />