[Spice-devel] [PATCH usbclerk] wix: install in 64-bit folders

[Christophe Fergeau]

Looks good, though the commit log is a bit terse.

Christophe

On Tue, Aug 13, 2013 at 07:51:25PM +0200, Marc-André Lureau wrote:
> ---
>  usbclerk.wxs.in | 21 +++++++++++++++++----
>  1 file changed, 17 insertions(+), 4 deletions(-)
> 
> diff --git a/usbclerk.wxs.in b/usbclerk.wxs.in
> index fed7805..8cb918a 100644
> --- a/usbclerk.wxs.in
> +++ b/usbclerk.wxs.in
> @@ -4,7 +4,19 @@
>  
>    <?define Version = "@VERSION@"?>
>    <?define UpgradeCode = "4a2c31e6-b10b-4c56-be28-c1ac35f5c52e"?>
> -  <Product Id="*" Name="USB Clerk" Manufacturer="$(env.MANUFACTURER)"
> +  <?define Arch = "@WIXL_ARCH@"?>
> +  <?if $(var.Arch) = "x64"?>
> +      <?define ArchString = "64-bit"?>
> +      <?define ArchProgramFilesFolder = "ProgramFiles64Folder"?>
> +      <?define Win64 = "yes"?>
> +  <?else?>
> +      <?define ArchString = "32-bit"?>
> +      <?define ArchProgramFilesFolder = "ProgramFilesFolder"?>
> +      <?define Win64 = "no"?>
> +  <?endif?>
> +
> +  <Product Id="*" Name="USB Clerk ($(var.ArchString))"
> +           Manufacturer="$(env.MANUFACTURER)"
>             Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)"
>             Language="1033">
>  
> @@ -25,16 +37,17 @@
>  
>      <!-- try to uninstall NSIS -->
>      <Property Id='NSISINSTALL'>
> -      <RegistrySearch Id='NSISSearch' Root='HKLM' Key='Software\Spice\usbclerk' Type="raw" Name='Uninstall'/>
> +      <RegistrySearch Id='NSISSearch' Root='HKLM'
> +                      Key='SOFTWARE\Spice\usbclerk' Type="raw"
> +                      Name='Uninstall' Win64="$(var.Win64)"/>
>      </Property>
>      <CustomAction Id="NSISUninstall" Property="NSISINSTALL" ExeCommand="/S" Execute="deferred" Impersonate="no" Return="ignore"/>
>      <InstallExecuteSequence>
> -      <AppSearch Sequence='1'/>
>        <Custom Action="NSISUninstall" After="InstallInitialize">NSISINSTALL AND NOT Installed</Custom>
>      </InstallExecuteSequence>
>  
>      <Directory Id="TARGETDIR" Name="SourceDir">
> -      <Directory Id="ProgramFilesFolder">
> +      <Directory Id="$(var.ArchProgramFilesFolder)">
>          <Directory Id="INSTALLDIR" Name="USBClerk">
>            <Component Id="CUSBClerk" Guid="e99861f7-524c-4107-860d-27f866072e53">
>              <File Id='usbclerkexe' Name='usbclerk.exe' DiskId='1' Source='usbclerk.exe' KeyPath='yes'/>
> -- 
> 1.8.3.rc1.49.g8d97506
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20130814/7a16871a/attachment.pgp>