Fwd: Re: [PATCH][REVIEW] gbuild conversion: module cpputools

Hi David,

cpputools/prj/makefile.mk was missing in my patch, and this broke the 
build, fixed:

David

-------- Original Message --------
Subject:        Re: [PATCH][REVIEW] gbuild conversion: module cpputools
Date:   Mon, 02 Apr 2012 22:32:28 +0200
From:   David Ostrovsky <david.ostrovsky@gmx.de>
To:     David Tardon <dtardon@redhat.com>, libreoffice@lists.freedesktop.org



Hi David,

thank you for your comments. Here is another try.
As you haven't merged feature/gbuild_components branch to master
I let "gb_Executable_add_api" in place:

As you suggested the next modules to convert are:
idlc, l10ntools, rdbmaker, soltools, unodevtools

David

PS:
contribution notice.

All of my past and future contributions to the LibreOffice project are
under LGPLv3+/GPLv3+/MPL until further notice.

On 01.04.2012 17:10, David Tardon wrote:
> On Sun, Apr 01, 2012 at 04:32:16PM +0200, David Ostrovsky wrote:
> > Hi,
> >
> > this patch convert cpputools module to gbuild
>
> Hi, David,
>
> it is a good start, but unfortunately not quite correct yet. See the
> comments below.
>
> >  From f44e44974d14be4482f1676600b8b3c407f60684 Mon Sep 17 00:00:00 2001
> > From: David Ostrovsky<David.Ostrovsky@gmx.de>
> > Date: Sun, 1 Apr 2012 16:24:31 +0200
> > Subject: [PATCH 2/2] gbuild conversion: cpputools module
> > +$(eval $(call gb_Executable_add_api,regcomp,\
> > +    udkapi \
> > +))
> That one is not obvious, but it is wrong anyway. The original makefile
> uses headers generated with cppumaker -C, as to not require unoapi.rdb
> at runtime. I am afraid you will have to wait a few days till
> feature/gbuild_components is integrated into master. Then you should use
> gb_Executable_add_internal_comprehensive_api .
>
> > +
> > +$(eval $(call gb_Executable_add_linked_libs,regcomp,\
> > +    basegfx \
> This is most certainly useless. I cannot imagine why would the regcomp
> executable need a graphic library .-)
>
> Another thing that is not obvious (and I think even documented anywhere
> at libreoffice) is that we want the module integrated into the old build
> system as well. To do that, just copy prj/makefile.mk from some already
> converted module, remove all lines containing "nmake" from prj/build.lst
> (actually I suppose that could be "everything but first two lines") and
> add something like
>
> pt  cpputools\prj   nmake   -   all pt_prj NULL
>
> . Also remove content from prj/d.lst .
>
> Also, after you are done, you can remove the now useless makefile.mk
> files (except the one in prj, of course).
>
> D.
> _______________________________________________
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice


From 5c55a9a05171e162e2f1c9398ba070988afc52e1 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <David.Ostrovsky@gmx.de>
Date: Wed, 4 Apr 2012 00:39:38 +0200
Subject: [PATCH] gbuild conversion: cpputools module

dmake stuff removed
---
 cpputools/prj/makefile.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 cpputools/prj/makefile.mk

diff --git a/cpputools/prj/makefile.mk b/cpputools/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/cpputools/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
-- 
1.7.5.4