On Mon, Apr 25, 2016 at 09:27:03PM +0200, Jean-Marc Lasgouttes wrote: > Le 19/04/2016 23:46, Scott Kostyshak a écrit : > > > > Normally I probably wouldn't want to change something at this point, but > > > > on 2.2.0rc1 that file takes up 24MB in the extracted tar ball so it > > > > would be nice to get rid of it. > > > > > > Is this a +1 for 2.2.0? > > > > Yes. Since you are confident, I think decreasing the tar ball by 20% is > > significant. > > Actually, my patch was not correct, this is the one that is needed for > building correctly. > > Concerning the risk, as long as it builds, it is OK. > > However, I do not think that Resources.cpp appreared in 2.2.0rc1 (I do not > have it here to check). I did find it in 2.1.4, though.
I don't understand. If I unpack the rc1 tar I get: $ ls -lh src/frontends/qt4/Resources.cpp -rw-rw-r-- 1 scott scott 23M Apr 11 21:31 src/frontends/qt4/Resources.cpp I thought that the differences in size between the two Resources.cpp that I reported here: https://www.mail-archive.com/search?l=mid&q=20160412181702.GA20336%40OptiPlex-9020.ad.ufl.edu is what started this conversation, no? Scott > > JMarc > > > > From 33e7d4f8a8b36a4709f39661b804fb543ac98274 Mon Sep 17 00:00:00 2001 > From: Jean-Marc Lasgouttes <lasgout...@lyx.org> > Date: Fri, 15 Apr 2016 16:16:07 +0200 > Subject: [PATCH] Resources.cpp is a built source, it should not be in > SOURCEFILES > > We want to avoid that Resources.cpp be distributed in the tar file. > --- > src/frontends/qt4/Makefile.am | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am > index 1c693e4..e3f41bc 100644 > --- a/src/frontends/qt4/Makefile.am > +++ b/src/frontends/qt4/Makefile.am > @@ -54,7 +54,6 @@ SOURCEFILES = \ > ButtonPolicy.h \ > Dialog.cpp \ > Dialog.h \ > - Resources.cpp \ > Action.cpp \ > BulletsModule.cpp \ > ButtonController.cpp \ > @@ -353,6 +352,7 @@ UIFILES = \ > VSpaceUi.ui \ > WrapUi.ui > > +nodist_liblyxqt4_a_SOURCES = Resources.cpp > > liblyxqt4.cpp: > @echo -e '$(SOURCEFILES:%=\n#include "%")\n' > $@ > -- > 2.5.0 >
signature.asc
Description: PGP signature
