[PATCH STABLE] wix: add an ssl certificate file to the WiX installers

Steve Borho steve at borho.org
Sat Jan 1 13:12:47 CST 2011


On Sat, Jan 1, 2011 at 5:04 AM, Adrian Buehlmann <adrian at cadifra.com> wrote:
> On 2010-12-30 01:48, Steve Borho wrote:
>> # HG changeset patch
>> # User Steve Borho <steve at borho.org>
>> # Date 1293668876 21600
>> # Branch stable
>> # Node ID e5c2338d76b5ab9f0925c6982b9ebb5fcecdb302
>> # Parent  5bcb6c9d16dbad4a99be85f70cdf2634bf2c1b40
>> wix: add an ssl certificate file to the WiX installers
>>
>> diff -r 5bcb6c9d16db -r e5c2338d76b5 contrib/wix/guids.wxi
>> --- a/contrib/wix/guids.wxi   Wed Dec 29 15:23:16 2010 -0600
>> +++ b/contrib/wix/guids.wxi   Wed Dec 29 18:27:56 2010 -0600
>> @@ -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} ?>
>>
>> diff -r 5bcb6c9d16db -r e5c2338d76b5 contrib/wix/mercurial.wxs
>> --- 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' />
>
> You removed the 64 bit flags on
>
> https://bitbucket.org/tortoisehg/thg/changeset/4f46a17c317a
>
> why not on Mercurial stable as well?

hgtk (stable) does not produce "true" 64bit Python applications, but
both Mercurial and the Qt branch do.  So on the hgtk branch the file
is always considered a 32bit file, installed in the "Program Files
(x86)" folder, along with the rest of the x86 hgtk application.

-- 
Steve Borho


More information about the Mercurial-devel mailing list