Re: [Qemu-devel] [PATCH] qemu-ga: Fixed paths issue with MSI build

[Michael Roth]

Quoting Leonid Bloch (2015-08-26 07:07:16)
> Previously, if building out-of-tree, the MSI build would fail since it wasn't 
> able to find the needed files.
> 
> Signed-off-by: Leonid Bloch <address@hidden>

Thanks, applied to qga tree:
  https://github.com/mdroth/qemu/commits/qga

> ---
>  Makefile                  | 4 ++--
>  qga/installer/qemu-ga.wxs | 6 +++---
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 340d9c8..2d35331 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -305,8 +305,8 @@ endif
> 
>  $(QEMU_GA_MSI): config-host.mak
> 
> -$(QEMU_GA_MSI):  qga/installer/qemu-ga.wxs
> -       $(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" 
> QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" 
> QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" \
> +$(QEMU_GA_MSI):  $(SRC_PATH)/qga/installer/qemu-ga.wxs
> +       $(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" 
> QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" 
> QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" BUILD_DIR="$(BUILD_DIR)" \
>         wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS) 
> $(QEMU_GA_MSI_MINGW_DLL_PATH) $<, "  WIXL  $@")
>  else
>  msi:
> diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
> index 41b11cf..7885973 100644
> --- a/qga/installer/qemu-ga.wxs
> +++ b/qga/installer/qemu-ga.wxs
> @@ -66,7 +66,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="../../qemu-ga.exe" KeyPath="yes" DiskId="1"/>
> +            <File Id="qemu_ga.exe" Name="qemu-ga.exe" 
> Source="$(env.BUILD_DIR)/qemu-ga.exe" KeyPath="yes" DiskId="1"/>
>              <ServiceInstall
>                Id="ServiceInstaller"
>                Type="ownProcess"
> @@ -85,10 +85,10 @@
>            </Component>
>            <?ifdef var.InstallVss?>
>            <Component Id="qga_vss_dll" 
> Guid="{CB19C453-FABB-4BB1-ABAB-6B74F687BFBB}">
> -            <File Id="qga_vss.dll" Name="qga-vss.dll" 
> Source="../vss-win32/qga-vss.dll" KeyPath="yes" DiskId="1"/>
> +            <File Id="qga_vss.dll" Name="qga-vss.dll" 
> Source="$(env.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="../vss-win32/qga-vss.tlb" KeyPath="yes" DiskId="1"/>
> +            <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?>
>            <Component Id="iconv" 
> Guid="{35EE3558-D34B-4F0A-B8BD-430FF0775246}">
> -- 
> 2.4.3
>