[PATCH stable] contrib/wix: add COPYING.rtf

Adrian Buehlmann adrian at cadifra.com
Thu Feb 25 07:59:26 CST 2010


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1267106169 -3600
# Branch stable
# Node ID baadff5591648fc945f17c5da6b500c25618c118
# Parent  b9e4a67329cdd5bcd7d170b95bf3b355100e6db2
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.

diff --git a/contrib/wix/COPYING.rtf b/contrib/wix/COPYING.rtf
new file mode 100644
index 0000000000000000000000000000000000000000..3418a971bda38b613fc6ffc74c9652fc026dad40
GIT binary patch
literal 1755
zc$|$@O>f&c5Z!Zu{)a&?+b&#3QsP6`C%1?jV-qLv2MPnc&=O_Mh9VV`vSAqh?>j at u
zn=BUSE at 04>I5Y3PnMe90Tqsi^jmNm;%`VMGnJ83QCcJ8Cc4?B`oJ46&2wP1*5>Xn|
zqRcDlyb1}duvQ-C>HrH{OEW&7- at iMF+-mD61IEIsA`v^Mlu5)^w<;Tr#xdqMu~SAl
z8LWc`Uj|iRfYI<K9cJ_yC11v8u}5`yMpN8~Hcv$(T_H4%(oDFxdY#=QwAQT-sd)KQ
zbd;~JBT=6v at St4YI+Pm3uks6INizDJB`Iyl5NOGtrPd%#0X9_1dB%AE?se_((ukJ|
zFR8%4P~U){hmxd%w`Dj;r^ax!E#%SwwE=x_xNU<15=xL)B)ql-mPdZknnF1s5)hQD
zJ=iine4nr3d+d{jr*^9`hkMMG at d~7ehTr%~6|g<V at F}A&dvususwx9oGX{k$5cVXJ
zo*}yc^wkDHY(C1sgdNz1lRgp4BWM|3^M+k(R+QK{yK|D5GSaKK0?@?5m2F5%MJ4I!
z2nVD_Zxys&m8~8C#lnx->h5v9g2{XXKPHRCWWL&rDKb=+cGX^Wm9TC!Qeo2MqzOl+
z{&2hac1Q7(ue1BvYQyZOv(@}|xrFKC0w(Y at S*&K?*7uVIJgpZ`kIUPh`^<o`u{bwf
zEAMGIFD<&Ri?SiGTyC`@<p-`S*}Vk>%gPQ81DahYhuf3e=IC%&1rn at jgt3vl5e)?d
zNrVrTg<2jj<L-z54^M<QEgf*9G)58x%N{BzzL2%tDcVJo>$YGT4AdPXYN>Bjj{Jl6
zu^@fq8A{77&G)6HXSQfxgr<g`D{!ZKE6`{-9*x|hMxssF{O&C^`1lIWBQ!P;(;7q9
zA#HuMF1b!Zq)gvi#nDc&!=pcBPUnSe#SxrAbbRZBMAOZH1zSE0=!)1uqzG;+loEAI
ze(M?k&5EGOZm}lY=j{OckWYioP*@UHUiH)Bs&5BX(V^PXT?Mk(qbD{OAYzGqS8QLQ
z?__VQrBeTOV9R*m`Lrm~sxO%vQtQd_x*+(yqDJKk_k=B at x&F^hpl!4y38$X<i{>$l
zr2!41YonEZc1H|gX7b?xMk$3z^Q_74%Rs?YV2ULbpK5E#;9so|9R4tYBumreb9$Ym
z16VI7y(0RfK&1=5<4a9e@!@p0dAeQP&*p!?hbn~T_p7V=a%&E~(#l{y%x(SQd_HlG
a^E#YFt3_U>@Uw*T`Fy$TJ8b%I`Q<N?wP%O`

diff --git a/contrib/wix/mercurial.wxs b/contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs
+++ b/contrib/wix/mercurial.wxs
@@ -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" />
 


More information about the Mercurial-devel mailing list