[v2,11/15] qga/wixl: prefer variables over environment

From: Marc-André Lureau <marcandre.lureau@redhat.com>

No need to setup an environment or to check if the variable is undefined
manually.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 qga/installer/qemu-ga.wxs | 30 +++++++++---------------------
 qga/meson.build           |  9 ++++-----
 2 files changed, 13 insertions(+), 26 deletions(-)

Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Thu, May 5, 2022 at 11:16 AM <marcandre.lureau@redhat.com> wrote:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> No need to setup an environment or to check if the variable is undefined
> manually.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  qga/installer/qemu-ga.wxs | 30 +++++++++---------------------
>  qga/meson.build           |  9 ++++-----
>  2 files changed, 13 insertions(+), 26 deletions(-)
>
> diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
> index 0950e8c6becc..8a19aa165651 100644
> --- a/qga/installer/qemu-ga.wxs
> +++ b/qga/installer/qemu-ga.wxs
> @@ -1,17 +1,5 @@
>  <?xml version="1.0" encoding="UTF-8"?>
>  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
> -  <?ifndef env.QEMU_GA_VERSION ?>
> -    <?error Environment variable QEMU_GA_VERSION undefined?>
> -  <?endif?>
> -
> -  <?ifndef env.QEMU_GA_DISTRO ?>
> -    <?error Environment variable QEMU_GA_DISTRO undefined?>
> -  <?endif?>
> -
> -  <?ifndef env.QEMU_GA_MANUFACTURER ?>
> -    <?error Environment variable QEMU_GA_MANUFACTURER undefined?>
> -  <?endif?>
> -
>    <?ifndef var.Arch?>
>      <?error Define Arch to 32 or 64?>
>    <?endif?>
> @@ -43,20 +31,20 @@
>      Name="QEMU guest agent"
>      Id="*"
>      UpgradeCode="{EB6B8302-C06E-4BEC-ADAC-932C68A3A98D}"
> -    Manufacturer="$(env.QEMU_GA_MANUFACTURER)"
> -    Version="$(env.QEMU_GA_VERSION)"
> +    Manufacturer="$(var.QEMU_GA_MANUFACTURER)"
> +    Version="$(var.QEMU_GA_VERSION)"
>      Language="1033">
>      <?if $(var.Arch) = 32 ?>
>      <Condition Message="Error: 32-bit version of Qemu GA can not be
> installed on 64-bit Windows.">NOT VersionNT64</Condition>
>      <?endif?>
>      <Package
> -      Manufacturer="$(env.QEMU_GA_MANUFACTURER)"
> +      Manufacturer="$(var.QEMU_GA_MANUFACTURER)"
>        InstallerVersion="200"
>        Languages="1033"
>        Compressed="yes"
>        InstallScope="perMachine"
>        />
> -    <Media Id="1" Cabinet="qemu_ga.$(env.QEMU_GA_VERSION).cab"
> EmbedCab="yes" />
> +    <Media Id="1" Cabinet="qemu_ga.$(var.QEMU_GA_VERSION).cab"
> EmbedCab="yes" />
>      <Property Id="WHSLogo">1</Property>
>      <MajorUpgrade
>        DowngradeErrorMessage="Error: A newer version of QEMU guest agent
> is already installed."
> @@ -66,7 +54,7 @@
>        <Directory Id="$(var.GaProgramFilesFolder)" Name="QEMU Guest Agent">
>          <Directory Id="qemu_ga_directory" Name="Qemu-ga">
>            <Component Id="qemu_ga"
> Guid="{908B7199-DE2A-4DC6-A8D0-27A5AE444FEA}">
> -            <File Id="qemu_ga.exe" Name="qemu-ga.exe"
> Source="$(env.BUILD_DIR)/qga/qemu-ga.exe" KeyPath="yes" DiskId="1"/>
> +            <File Id="qemu_ga.exe" Name="qemu-ga.exe"
> Source="$(var.BUILD_DIR)/qga/qemu-ga.exe" KeyPath="yes" DiskId="1"/>
>              <ServiceInstall
>                Id="ServiceInstaller"
>                Type="ownProcess"
> @@ -88,10 +76,10 @@
>              <File Id="libstdc++-6.lib" Name="libstdc++-6.dll"
> Source="$(var.Mingw_bin)/libstdc++-6.dll" KeyPath="yes" DiskId="1"/>
>            </Component>
>            <Component Id="qga_vss_dll"
> Guid="{CB19C453-FABB-4BB1-ABAB-6B74F687BFBB}">
> -            <File Id="qga_vss.dll" Name="qga-vss.dll"
> Source="$(env.BUILD_DIR)/qga/vss-win32/qga-vss.dll" KeyPath="yes"
> DiskId="1"/>
> +            <File Id="qga_vss.dll" Name="qga-vss.dll"
> Source="$(var.BUILD_DIR)/qga/vss-win32/qga-vss.dll" KeyPath="yes"
> DiskId="1"/>
>            </Component>
>            <Component Id="qga_vss_tlb"
> Guid="{D8D584B1-59C2-4FB7-A91F-636FF7BFA66E}">
> -            <File Id="qga_vss.tlb" Name="qga-vss.tlb"
> Source="$(env.BUILD_DIR)/qga/vss-win32/qga-vss.tlb" KeyPath="yes"
> DiskId="1"/>
> +            <File Id="qga_vss.tlb" Name="qga-vss.tlb"
> Source="$(var.BUILD_DIR)/qga/vss-win32/qga-vss.tlb" KeyPath="yes"
> DiskId="1"/>
>            </Component>
>            <?endif?>
>            <?if $(var.Arch) = "32"?>
> @@ -133,9 +121,9 @@
>            </Component>
>            <Component Id="registry_entries"
> Guid="{D075D109-51CA-11E3-9F8B-000C29858960}">
>              <RegistryKey Root="HKLM"
> -
>  Key="Software\$(env.QEMU_GA_MANUFACTURER)\$(env.QEMU_GA_DISTRO)\Tools\QemuGA">
> +
>  Key="Software\$(var.QEMU_GA_MANUFACTURER)\$(var.QEMU_GA_DISTRO)\Tools\QemuGA">
>                <RegistryValue Type="string" Name="ProductID"
> Value="fb0a0d66-c7fb-4e2e-a16b-c4a3bfe8d13b" />
> -              <RegistryValue Type="string" Name="Version"
> Value="$(env.QEMU_GA_VERSION)" />
> +              <RegistryValue Type="string" Name="Version"
> Value="$(var.QEMU_GA_VERSION)" />
>              </RegistryKey>
>            </Component>
>          </Directory>
> diff --git a/qga/meson.build b/qga/meson.build
> index 6d9f39bb321b..3ad3bc0260cf 100644
> --- a/qga/meson.build
> +++ b/qga/meson.build
> @@ -121,15 +121,14 @@ if targetos == 'windows'
>                              output: 'qemu-ga-@0@.msi'.format(host_arch),
>                              depends: deps,
>                              command: [
> -                              find_program('env'),
> -                              'QEMU_GA_VERSION=' +
> config_host['QEMU_GA_VERSION'],
> -                              'QEMU_GA_MANUFACTURER=' +
> config_host['QEMU_GA_MANUFACTURER'],
> -                              'QEMU_GA_DISTRO=' +
> config_host['QEMU_GA_DISTRO'],
> -                              'BUILD_DIR=' + meson.build_root(),
>                                wixl, '-o', '@OUTPUT0@', '@INPUT0@',
>                                qemu_ga_msi_arch[cpu],
>                                qemu_ga_msi_vss,
> +                              '-D', 'BUILD_DIR=' + meson.build_root(),
>                                '-D', 'Mingw_bin=' +
> config_host['QEMU_GA_MSI_MINGW_BIN_PATH'],
> +                              '-D', 'QEMU_GA_VERSION=' +
> config_host['QEMU_GA_VERSION'],
> +                              '-D', 'QEMU_GA_MANUFACTURER=' +
> config_host['QEMU_GA_MANUFACTURER'],
> +                              '-D', 'QEMU_GA_DISTRO=' +
> config_host['QEMU_GA_DISTRO'],
>                              ])
>      all_qga += [qga_msi]
>      alias_target('msi', qga_msi)
> --
> 2.36.0.44.g0f828332d5ac
>
>