[Spice-devel] [vdagent-win PATCH 05/13] msi: Do not generate deps.txt

[Christophe Fergeau]

On Mon, May 28, 2018 at 09:26:47AM -0400, Frediano Ziglio wrote:
> > 
> > On Mon, May 28, 2018 at 09:57:58AM +0100, Frediano Ziglio wrote:
> > > There's no reason to tell the package installed on the build system
> > > used.
> > 
> > This can be useful to know which version of zlib or libpng are bundled
> > with the agent msi installer when debugging something which is installed
> > on a system. However, the .wxs file does not seem to list zlib or libpng
> > as dependencies?
> > 
> 
> We compile the executables with -static so both libraries are included
> in the executable.

Ah right, the -static was apparent at the beginning of the cmake patch,
but this did not trigger an association in my brain when replying this
;) ACK with this mentioned in the commit log.

Christophe

> 
> Is easier to understand the version with strings:
> 
> strings vdagent.exe | grep 'Mark Adler\|libpng version'
> libpng version 1.6.29 - March 16, 2017
>  libpng version 1.6.29 - March 16, 2017
>  deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler
>  inflate 1.2.8 Copyright 1995-2013 Mark Adler
> 
> > Christophe
> > 
> 
> Frediano
> 
> > > 
> > > Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> > > ---
> > >  Makefile.am          | 5 +----
> > >  spice-vdagent.wxs.in | 4 ----
> > >  2 files changed, 1 insertion(+), 8 deletions(-)
> > > 
> > > diff --git a/Makefile.am b/Makefile.am
> > > index 62640f2..3020824 100644
> > > --- a/Makefile.am
> > > +++ b/Makefile.am
> > > @@ -100,15 +100,12 @@ test_log_win_SOURCES =			\
> > >  	common/test-log.cpp		\
> > >  	$(NULL)
> > >  
> > > -deps.txt:
> > > -	$(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
> > > -
> > >  MANUFACTURER = The Spice Project
> > >  
> > >  EXTRA_DIST += spice-vdagent.wxs.in
> > >  CONFIG_STATUS_DEPENDENCIES = spice-vdagent.wxs.in
> > >  
> > > -spice-vdagent-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-vdagent.wxs
> > > deps.txt all
> > > +spice-vdagent-$(WIXL_ARCH)-$(VERSION)$(BUILDID).msi: spice-vdagent.wxs all
> > >  	$(AM_V_GEN)DESTDIR=`mktemp -d`&&				\
> > >  	make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null &&	\
> > >  	MANUFACTURER="$(MANUFACTURER)" wixl -D SourceDir=$(prefix)	\
> > > diff --git a/spice-vdagent.wxs.in b/spice-vdagent.wxs.in
> > > index 452f995..7432ca9 100644
> > > --- a/spice-vdagent.wxs.in
> > > +++ b/spice-vdagent.wxs.in
> > > @@ -61,9 +61,6 @@
> > >                              Wait="yes"/>
> > >              </Component>
> > >            </Directory>
> > > -          <Component Id="CDepsTxt" Guid="*">
> > > -            <File Id='depstxt' Name='deps.txt' DiskId='1'
> > > Source='deps.txt' KeyPath='yes'/>
> > > -          </Component>
> > >          </Directory>
> > >        </Directory>
> > >      </Directory>
> > > @@ -71,7 +68,6 @@
> > >      <Feature Id="Complete"  Level="1">
> > >        <ComponentRef Id="CSpiceAgent"/>
> > >        <ComponentRef Id="CSpiceService"/>
> > > -      <ComponentRef Id="CDepsTxt"/>
> > >      </Feature>
> > >  
> > >    </Product>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20180528/73eecc73/attachment.sig>