[PATCH][REVIEW] gbuild conversion: module cpputools

David Tardon dtardon at redhat.com
Sun Apr 1 08:10:43 PDT 2012


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 at 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.


More information about the LibreOffice mailing list