# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2015-04-23 13:44:46
# Node ID 6e38b6fc4123f61b840250953ba24b42a72cc7fb
# Parent  b2c1ff96c1e168e4506aeb86fdb448e7072f9be7

wix: remove cacert.pem from Windows distribution

It should not be included in the Windows installers because it prevents
loading CA certificates from the system store on Python 2.7.9, implemented
by 760a86865f80. The msi packages bundles Python 2.7.9, so cacert.pem is no
longer necessary.

Backed out changeset e5c2338d76b5

diff --git a/contrib/wix/guids.wxi b/contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi
+++ b/contrib/wix/guids.wxi
@@ -44,8 +44,6 @@
   <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?>
   <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?>
   <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?>
-  <?define paths.rc.guid = {F9ADF21D-5F0B-4934-8CD9-14BE63664721} ?>
-  <?define cacert.pem.guid = {EC1B2630-FE21-46E6-915B-A6545AF703D4} ?>
   <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
 
 </Include>
diff --git a/contrib/wix/mercurial.wxs b/contrib/wix/mercurial.wxs
--- a/contrib/wix/mercurial.wxs
+++ b/contrib/wix/mercurial.wxs
@@ -82,15 +82,6 @@
               <File Id='mergetools.rc' Name='MergeTools.rc' Source='mercurial\default.d\mergetools.rc'
                     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>
@@ -132,8 +123,6 @@
         <ComponentRef Id='COPYING' />
         <ComponentRef Id='mercurial.rc' />
         <ComponentRef Id='mergetools.rc' />
-        <ComponentRef Id='paths.rc' />
-        <ComponentRef Id='cacert.pem' />
         <ComponentRef Id='helpFolder' />
         <ComponentGroupRef Id='templatesFolder' />
         <MergeRef Id='VCRuntime' />