Mercurial > hg
comparison contrib/wix/mercurial.wxs @ 10732:5484f6e17984 stable
wix: use build variable for VC redist source dir
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Fri, 19 Mar 2010 10:26:19 +0100 |
| parents | 67cb29dbb66e |
| children | e26102c40e2e |
comparison
equal
deleted
inserted
replaced
| 10730:4d6bd7b8b6d8 | 10732:5484f6e17984 |
|---|---|
| 78 </Directory> | 78 </Directory> |
| 79 </Directory> | 79 </Directory> |
| 80 | 80 |
| 81 <Directory Id="DesktopFolder" Name="Desktop" /> | 81 <Directory Id="DesktopFolder" Name="Desktop" /> |
| 82 <Merge Id='VCRuntime' DiskId='1' Language='1033' | 82 <Merge Id='VCRuntime' DiskId='1' Language='1033' |
| 83 SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\microsoft.vcxx.crt.x86_msm.msm' /> | 83 SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' /> |
| 84 <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033' | 84 <Merge Id='VCRuntimePolicy' DiskId='1' Language='1033' |
| 85 SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' /> | 85 SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' /> |
| 86 </Directory> | 86 </Directory> |
| 87 | 87 |
| 88 <Feature Id='Complete' Title='Mercurial $(var.Version)' Description='The complete package' | 88 <Feature Id='Complete' Title='Mercurial $(var.Version)' Description='The complete package' |
| 89 Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' > | 89 Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' > |
| 90 <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app' | 90 <Feature Id='MainProgram' Title='Program' Description='Mercurial command line app' |