[Libreoffice-commits] core.git: scp2/InstallModule_ooo.mk

[Pranav Kant]

Hi Thorsten,

Sorry for responding late. I hope things are fixed now after Miklos and
yours patch.

On Wed, Jan 20, 2016 at 6:39 AM, Thorsten Behrens <
thb at documentfoundation.org> wrote:

> Hi Pranav,
>
> can you review the below commit - your scp2 changes broke Windows
> packaging.
>
> Thanks, Thorsten
>
> libreoffice-commits at lists.freedesktop.org wrote:
> >  scp2/InstallModule_ooo.mk |    4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > New commits:
> > commit 8a99e4b0de7a516b8577d34dd39296afda604290
> > Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
> > Date:   Wed Jan 20 01:47:37 2016 +0100
> >
> >     No LOKDocView packaging for Win/Mac for the while
> >
> >     This unbreaks Windows packaging after
> >     85b46f51928dc17cda1bc974bca9159de9221b4d - I guess this should be
> >     Linux-only for the moment.
> >
> >     Change-Id: Ie19f7f3e4b611e2884e3fdb1a64c63927b018989
> >
> > diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
> > index 47c8cc6..2f4320b 100644
> > --- a/scp2/InstallModule_ooo.mk
> > +++ b/scp2/InstallModule_ooo.mk
> > @@ -103,7 +103,9 @@ $(eval $(call
> gb_InstallModule_add_scpfiles,scp2/ooo,\
> >               scp2/source/ooo/mingw_dlls \
> >       ) \
> >      scp2/source/ooo/module_filter \
> > -    scp2/source/ooo/module_libreofficekit \
> > +    $(if $(filter-out MACOSX WNT,$(OS)), \
> > +             scp2/source/ooo/module_libreofficekit \
> > +     ) \
> >  ))
> >
> >  $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\
>
> _______________________________________________
> LibreOffice mailing list
> LibreOffice at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>


-- 
Regards,
Pranav Kant
http://pranavk.me
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20160120/81d406be/attachment.html>