Mercurial > public > mercurial-scm > hg

diff contrib/wix/contrib.wxs @ 13042:bd9bc4123920 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wix: add support for x64 native MSI packages
author Steve Borho <steve@borho.org>
date Fri, 26 Nov 2010 17:40:13 -0600
parents 0c6c600c03fd
children 5716d10e89e7
line wrap: on
line diff
--- a/contrib/wix/contrib.wxs	Fri Nov 26 16:18:19 2010 -0600
+++ b/contrib/wix/contrib.wxs	Fri Nov 26 17:40:13 2010 -0600
@@ -2,6 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?include guids.wxi ?>
+  <?include defines.wxi ?>
 
   <Fragment>
     <ComponentGroup Id="contribFolder">
@@ -13,7 +14,7 @@
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
       <Directory Id="contribdir" Name="contrib" FileSource="$(var.SourceDir)">
-        <Component Id="contrib" Guid="$(var.contrib.guid)">
+        <Component Id="contrib" Guid="$(var.contrib.guid)" Win64='$(var.IsX64)'>
           <File Name="bash_completion" KeyPath="yes" />
           <File Name="hgk" />
           <File Name="hgweb.fcgi" />
@@ -27,7 +28,7 @@
           <File Name="zsh_completion" />
         </Component>
         <Directory Id="vimdir" Name="vim">
-          <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)">
+          <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)" Win64='$(var.IsX64)'>
             <File Name="hg-menu.vim" KeyPath="yes" />
             <File Name="HGAnnotate.vim" />
             <File Name="hgcommand.vim" />