[virt-tools-list] [PATCH virt-viewer] msi: Do not escape '$' for wixl-heat

[Christophe Fergeau]

Hey,

On Fri, Jul 21, 2017 at 07:27:45PM +0200, Pavel Grunt wrote:
> wixl-heat does it itself since its commit 9273514c95e343340d18067b4f1
> 
> otherwise msi generation fails with:
> Couldn't find file $/tmp/tmp.1MYrxTLd1U/usr/x86_64-w64-mingw32/sys-root/mingw/bin/debug-helper.exe

Looks like either the git version, or all msitools releases are going to
be broken by this change? Should we do something conditional on wixl
--version output? (wixl-heat does not have --version).

Christophe


> ---
>  data/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/data/Makefile.am b/data/Makefile.am
> index 55718d9..d9c7049 100644
> --- a/data/Makefile.am
> +++ b/data/Makefile.am
> @@ -43,7 +43,7 @@ deps.txt:
>  virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
>  	$(AM_V_GEN)DESTDIR=`mktemp -d` &&				\
>  	make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null &&	\
> -	find $$DESTDIR | wixl-heat -p $$DESTDIR$(prefix)/		\
> +	find $$DESTDIR | wixl-heat -p $DESTDIR$(prefix)/		\
>  	    --component-group CG.virt-viewer --var var.DESTDIR		\
>  	    --directory-ref=INSTALLDIR > virt-viewer-files.wxs &&	\
>  	MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix)	\
> -- 
> 2.13.3
> 
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list at redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/virt-tools-list/attachments/20170724/eee452bb/attachment.sig>