Mercurial > hg

changeset 24839:6e38b6fc4123 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Yuya Nishihara <yuya@tcha.org>
date Thu, 23 Apr 2015 22:44:46 +0900
parents b2c1ff96c1e1
children a5e3634ba024
files contrib/wix/guids.wxi contrib/wix/mercurial.wxs
diffstat 2 files changed, 0 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/wix/guids.wxi	Thu Apr 23 22:39:21 2015 +0900
+++ b/contrib/wix/guids.wxi	Thu Apr 23 22:44:46 2015 +0900
@@ -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>
--- a/contrib/wix/mercurial.wxs	Thu Apr 23 22:39:21 2015 +0900
+++ b/contrib/wix/mercurial.wxs	Thu Apr 23 22:44:46 2015 +0900
@@ -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' />