From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43011)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1ZUjEa-00043t-Cg
	for qemu-devel@nongnu.org; Wed, 26 Aug 2015 18:31:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1ZUjEX-0008RD-6z
	for qemu-devel@nongnu.org; Wed, 26 Aug 2015 18:31:56 -0400
Received: from mail-ob0-x233.google.com ([2607:f8b0:4003:c01::233]:35375)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1ZUjEX-0008R5-1V
	for qemu-devel@nongnu.org; Wed, 26 Aug 2015 18:31:53 -0400
Received: by obbwr7 with SMTP id wr7so1506773obb.2
	for <qemu-devel@nongnu.org>; Wed, 26 Aug 2015 15:31:52 -0700 (PDT)
Sender: fluxion <flukshun@gmail.com>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Michael Roth <mdroth@linux.vnet.ibm.com>
In-Reply-To: <1440590836-25002-1-git-send-email-leonid@daynix.com>
References: <1440590836-25002-1-git-send-email-leonid@daynix.com>
Message-ID: <20150826223128.4090.76092@loki>
Date: Wed, 26 Aug 2015 17:31:28 -0500
Subject: Re: [Qemu-devel] [PATCH] qemu-ga: Fixed paths issue with MSI build
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Leonid Bloch <leonid@daynix.com>, qemu-devel@nongnu.org
Cc: marcandre.lureau@gmail.com

Quoting Leonid Bloch (2015-08-26 07:07:16)
> Previously, if building out-of-tree, the MSI build would fail since it wa=
sn't able to find the needed files.
> =

> Signed-off-by: Leonid Bloch <leonid@daynix.com>

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=3D"$(QEMU_GA_VERSION)" QEMU_=
GA_MANUFACTURER=3D"$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO=3D"$(QEMU_GA_DIS=
TRO)" \
> +$(QEMU_GA_MSI):  $(SRC_PATH)/qga/installer/qemu-ga.wxs
> +       $(call quiet-command,QEMU_GA_VERSION=3D"$(QEMU_GA_VERSION)" QEMU_=
GA_MANUFACTURER=3D"$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO=3D"$(QEMU_GA_DIS=
TRO)" BUILD_DIR=3D"$(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=3D"$(var.GaProgramFilesFolder)" Name=3D"QEMU Guest A=
gent">
>          <Directory Id=3D"qemu_ga_directory" Name=3D"Qemu-ga">
>            <Component Id=3D"qemu_ga" Guid=3D"{908B7199-DE2A-4DC6-A8D0-27A=
5AE444FEA}">
> -            <File Id=3D"qemu_ga.exe" Name=3D"qemu-ga.exe" Source=3D"../.=
./qemu-ga.exe" KeyPath=3D"yes" DiskId=3D"1"/>
> +            <File Id=3D"qemu_ga.exe" Name=3D"qemu-ga.exe" Source=3D"$(en=
v.BUILD_DIR)/qemu-ga.exe" KeyPath=3D"yes" DiskId=3D"1"/>
>              <ServiceInstall
>                Id=3D"ServiceInstaller"
>                Type=3D"ownProcess"
> @@ -85,10 +85,10 @@
>            </Component>
>            <?ifdef var.InstallVss?>
>            <Component Id=3D"qga_vss_dll" Guid=3D"{CB19C453-FABB-4BB1-ABAB=
-6B74F687BFBB}">
> -            <File Id=3D"qga_vss.dll" Name=3D"qga-vss.dll" Source=3D"../v=
ss-win32/qga-vss.dll" KeyPath=3D"yes" DiskId=3D"1"/>
> +            <File Id=3D"qga_vss.dll" Name=3D"qga-vss.dll" Source=3D"$(en=
v.BUILD_DIR)/qga/vss-win32/qga-vss.dll" KeyPath=3D"yes" DiskId=3D"1"/>
>            </Component>
>            <Component Id=3D"qga_vss_tlb" Guid=3D"{D8D584B1-59C2-4FB7-A91F=
-636FF7BFA66E}">
> -            <File Id=3D"qga_vss.tlb" Name=3D"qga-vss.tlb" Source=3D"../v=
ss-win32/qga-vss.tlb" KeyPath=3D"yes" DiskId=3D"1"/>
> +            <File Id=3D"qga_vss.tlb" Name=3D"qga-vss.tlb" Source=3D"$(en=
v.BUILD_DIR)/qga/vss-win32/qga-vss.tlb" KeyPath=3D"yes" DiskId=3D"1"/>
>            </Component>
>            <?endif?>
>            <Component Id=3D"iconv" Guid=3D"{35EE3558-D34B-4F0A-B8BD-430FF=
0775246}">
> -- =

> 2.4.3
>=20