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

[Pavel Grunt]

Hi,

On Mon, 2017-07-24 at 08:54 +0100, Christophe Fergeau wrote:
> 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?

Yes. All the future releases are going to be broken/fixed [1] (do you know why
it was escaped?) since that change.

>  Should we do something conditional on wixl
> --version output? (wixl-heat does not have --version).

imo overkill. The msi release always happen using the latest released fedora.
And due to changes in rpms, you need the updated version of msitools anyway...

Pavel

[1] https://bugzilla.gnome.org/show_bug.cgi?id=756904
> 
> 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