[for,2.5,1/1] qga: gspawn() console helper to Windows guest agent msi build

From: Yuri Pudgorodskiy <yur@virtuozzo.com>

This helper, gspawn-win64-helper-console.exe for 64-bit and
gspawn-win32-helper-console.exe for 32-bit environment,
is needed for gspawn() mingw implementation, used by guest-exec command.

Without these files guest-exec command on Windows will not
work with "file not found" diagnostic message.

Signed-off-by: Yuri Pudgorodskiy <yur@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 qga/installer/qemu-ga.wxs | 11 +++++++++++
 1 file changed, 11 insertions(+)

On 11/19/2015 03:20 PM, Denis V. Lunev wrote:
> From: Yuri Pudgorodskiy <yur@virtuozzo.com>
>
> This helper, gspawn-win64-helper-console.exe for 64-bit and
> gspawn-win32-helper-console.exe for 32-bit environment,
> is needed for gspawn() mingw implementation, used by guest-exec command.
>
> Without these files guest-exec command on Windows will not
> work with "file not found" diagnostic message.
>
> Signed-off-by: Yuri Pudgorodskiy <yur@virtuozzo.com>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
>   qga/installer/qemu-ga.wxs | 11 +++++++++++
>   1 file changed, 11 insertions(+)
>
> diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
> index 6804f02..f25afdd 100644
> --- a/qga/installer/qemu-ga.wxs
> +++ b/qga/installer/qemu-ga.wxs
> @@ -91,6 +91,16 @@
>               <File Id="qga_vss.tlb" Name="qga-vss.tlb" Source="$(env.BUILD_DIR)/qga/vss-win32/qga-vss.tlb" KeyPath="yes" DiskId="1"/>
>             </Component>
>             <?endif?>
> +          <?if $(var.Arch) = "32"?>
> +          <Component Id="gspawn-helper-console" Guid="{446185B3-87BE-43D2-96B8-0FEFD9E8696D}">
> +            <File Id="gspawn-win32-helper-console.exe" Name="gspawn-win32-helper-console.exe" Source="$(var.Mingw_bin)/gspawn-win32-helper-console.exe" KeyPath="yes" DiskId="1"/>
> +          </Component>
> +          <?endif?>
> +          <?if $(var.Arch) = "64"?>
> +          <Component Id="gspawn-helper-console" Guid="{9E615A9F-349A-4992-A5C2-C10BAD173660}">
> +            <File Id="gspawn-win64-helper-console.exe" Name="gspawn-win64-helper-console.exe" Source="$(var.Mingw_bin)/gspawn-win64-helper-console.exe" KeyPath="yes" DiskId="1"/>
> +          </Component>
> +          <?endif?>
>             <Component Id="iconv" Guid="{35EE3558-D34B-4F0A-B8BD-430FF0775246}">
>               <File Id="iconv.dll" Name="iconv.dll" Source="$(var.Mingw_bin)/iconv.dll" KeyPath="yes" DiskId="1"/>
>             </Component>
> @@ -148,6 +158,7 @@
>         <ComponentRef Id="qga_vss_dll" />
>         <ComponentRef Id="qga_vss_tlb" />
>         <?endif?>
> +      <ComponentRef Id="gspawn-helper-console" />
>         <ComponentRef Id="iconv" />
>         <ComponentRef Id="libgcc_arch_lib" />
>         <ComponentRef Id="libglib" />
ping

Quoting Denis V. Lunev (2015-11-19 06:20:37)
> From: Yuri Pudgorodskiy <yur@virtuozzo.com>
> 
> This helper, gspawn-win64-helper-console.exe for 64-bit and
> gspawn-win32-helper-console.exe for 32-bit environment,
> is needed for gspawn() mingw implementation, used by guest-exec command.
> 
> Without these files guest-exec command on Windows will not
> work with "file not found" diagnostic message.
> 
> Signed-off-by: Yuri Pudgorodskiy <yur@virtuozzo.com>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Michael Roth <mdroth@linux.vnet.ibm.com>

Thanks, applied to qga tree:

  https://github.com/mdroth/qemu/commits/qga

> ---
>  qga/installer/qemu-ga.wxs | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
> index 6804f02..f25afdd 100644
> --- a/qga/installer/qemu-ga.wxs
> +++ b/qga/installer/qemu-ga.wxs
> @@ -91,6 +91,16 @@
>              <File Id="qga_vss.tlb" Name="qga-vss.tlb" Source="$(env.BUILD_DIR)/qga/vss-win32/qga-vss.tlb" KeyPath="yes" DiskId="1"/>
>            </Component>
>            <?endif?>
> +          <?if $(var.Arch) = "32"?>
> +          <Component Id="gspawn-helper-console" Guid="{446185B3-87BE-43D2-96B8-0FEFD9E8696D}">
> +            <File Id="gspawn-win32-helper-console.exe" Name="gspawn-win32-helper-console.exe" Source="$(var.Mingw_bin)/gspawn-win32-helper-console.exe" KeyPath="yes" DiskId="1"/>
> +          </Component>
> +          <?endif?>
> +          <?if $(var.Arch) = "64"?>
> +          <Component Id="gspawn-helper-console" Guid="{9E615A9F-349A-4992-A5C2-C10BAD173660}">
> +            <File Id="gspawn-win64-helper-console.exe" Name="gspawn-win64-helper-console.exe" Source="$(var.Mingw_bin)/gspawn-win64-helper-console.exe" KeyPath="yes" DiskId="1"/>
> +          </Component>
> +          <?endif?>
>            <Component Id="iconv" Guid="{35EE3558-D34B-4F0A-B8BD-430FF0775246}">
>              <File Id="iconv.dll" Name="iconv.dll" Source="$(var.Mingw_bin)/iconv.dll" KeyPath="yes" DiskId="1"/>
>            </Component>
> @@ -148,6 +158,7 @@
>        <ComponentRef Id="qga_vss_dll" />
>        <ComponentRef Id="qga_vss_tlb" />
>        <?endif?>
> +      <ComponentRef Id="gspawn-helper-console" />
>        <ComponentRef Id="iconv" />
>        <ComponentRef Id="libgcc_arch_lib" />
>        <ComponentRef Id="libglib" />
> -- 
> 2.1.4
>