facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

wix: remove cacert.pem from Windows distribution

Browse Source 
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 b572b9736ab0. The msi packages bundles Python 2.7.9, so cacert.pem is no
longer necessary.

Backed out changeset 7c9264a028c0
This commit is contained in:
Yuya Nishihara 2015-04-23 22:44:46 +09:00
parent 8fe63fa17c
commit 6093d4a115
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/wix/guids.wxi
View File

@ -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>

11
contrib/wix/mercurial.wxs
View File

@ -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' />