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

merge with stable

Browse Source
This commit is contained in:
Steve Borho 2010-12-30 23:36:50 -06:00
commit 933f43725b
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/wix/guids.wxi
View File

@ -44,6 +44,8 @@
<?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} ?>
<?define hgcmd.guid = {65CCC756-E72E-4C5F-901E-D575EDC80DB3} ?>

11
contrib/wix/mercurial.wxs
View File

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