[PATCH 2 of 2] wix: add support for x64 native MSI packages

[Steve Borho]

On Fri, Nov 26, 2010 at 6:59 PM, Adrian Buehlmann <adrian at cadifra.com> wrote:
> On 2010-11-27 00:58, Steve Borho wrote:
>> # HG changeset patch
>> # User Steve Borho <steve at borho.org>
>> # Date 1290814813 21600
>> # Branch stable
>> # Node ID f8d3b069602369abffce35962c75260306249d71
>> # Parent  264b201530179e27b98995660f7340d8754b782d
>> wix: add support for x64 native MSI packages
>
> [..]
>
>> diff -r 264b20153017 -r f8d3b0696023 contrib/wix/mercurial.wxs
>> --- a/contrib/wix/mercurial.wxs       Fri Nov 26 16:18:19 2010 -0600
>> +++ b/contrib/wix/mercurial.wxs       Fri Nov 26 17:40:13 2010 -0600
>> @@ -7,15 +7,16 @@
>>    GNU General Public License version 2 or any later version. -->
>>
>>    <?include guids.wxi ?>
>> +  <?include defines.wxi ?>
>>
>>    <?if $(var.Platform) = "x64" ?>
>> -    <?define IsX64 = yes ?>
>> +    <?define PFolder = ProgramFiles64Folder ?>
>>    <?else?>
>> -    <?define IsX64 = no ?>
>> +    <?define PFolder = ProgramFilesFolder ?>
>>    <?endif?>
>>
>>    <Product Id='*'
>> -    Name='Mercurial $(var.Version)'
>> +    Name='Mercurial $(var.Version) ($(var.Platform))'
>>      UpgradeCode='$(var.ProductUpgradeCode)'
>>      Language='1033' Codepage='1252' Version='$(var.Version)'
>>      Manufacturer='Matt Mackall and others'>
>> @@ -24,6 +25,7 @@
>>        Keywords='Installer'
>>        Description="Mercurial distributed SCM (version $(var.Version))"
>>        Comments='$(var.Comments)'
>> +      Platform='$(var.Platform)'
>>        Manufacturer='Matt Mackall and others'
>>        InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
>>
>> @@ -31,8 +33,14 @@
>>             CompressionLevel='high' />
>>      <Property Id='DiskPrompt' Value="Mercurial $(var.Version) Installation [1]" />
>>
>> -    <Condition Message='Mercurial requires Windows XP or higher'
>> -      >VersionNT >= 501</Condition>
>> +    <?if $(var.Platform) = "x86" ?>
>> +      <Condition Message = "This x86 installer may not be used on a x64 platform">
>> +          NOT VersionNT64
>> +      </Condition>
>> +    <?endif?>
>
> Why?
>
> And if this restriction is needed: why on stable? You suddenly stop
> providing x86 installers for x64 users on the stable track?
>
> Until that change, x64 users were able to install an x86 package.

Well, there were no x64 packages until today, but point taken.

> I'm wondering if this check wasn't rather meant the other way around
> (but I think x64 packages can't be installed on x86 implicitly).

I can't think of a compelling reason to leave the check in there, so
I'll remove it.

-- 
Steve Borho