Mercurial > public > mercurial-scm > hg

diff contrib/wix/mercurial.wxs @ 13216:e5c2338d76b5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wix: add an ssl certificate file to the WiX installers
author Steve Borho <steve@borho.org>
date Wed, 29 Dec 2010 18:27:56 -0600
parents db1433e4bf5f
children 391948925b67
line wrap: on
line diff
--- a/contrib/wix/mercurial.wxs	Wed Dec 29 15:23:16 2010 -0600
+++ b/contrib/wix/mercurial.wxs	Wed Dec 29 18:27:56 2010 -0600
@@ -82,6 +82,15 @@
               <File Id='mergetools.rc' Name='MergeTools.rc' Source='contrib\mergetools.hgrc'
                     ReadOnly='yes' KeyPath='yes'/>
             </Component>
+            <Component Id='paths.rc' Guid='$(var.paths.rc.guid)' Win64='$(var.IsX64)'>
+              <CreateFolder/>
+              <IniFile Id="ini0" Action="createLine" Directory="HGRCD" Name="Paths.rc"
+                Section="web" Key="cacerts" Value="[INSTALLDIR]hgrc.d\cacert.pem" />
+            </Component>
+            <Component Id='cacert.pem' Guid='$(var.cacert.pem.guid)' Win64='$(var.IsX64)'>
+              <File Id='cacert.pem' Name='cacert.pem' Source='..\misc\cacert.pem'
+                    ReadOnly='yes' KeyPath='yes'/>
+            </Component>
           </Directory>
 
           <Directory Id='binFolder' Name='bin'>
@@ -128,6 +137,8 @@
         <ComponentRef Id='COPYING' />
         <ComponentRef Id='mercurial.rc' />
         <ComponentRef Id='mergetools.rc' />
+        <ComponentRef Id='paths.rc' />
+        <ComponentRef Id='cacert.pem' />
         <ComponentRef Id='helpFolder' />
         <ComponentRef Id='HgCmd' />
         <ComponentGroupRef Id='templatesFolder' />