From 7c1026ab3f6d97960ef57b06abb0e605549458c6 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 23 Apr 2011 21:14:25 -0500 Subject: create a pseudo-module tail_build to take advantage of gbuild features gbuild allow for multiple 'module' to be build as one Makefile. This help with parallelism. This module build all the 'tail' end module. these that are not dependencies or other dmake-based module, and that pseudo module is declared as a dependency of postprocess instead of the individual modules it 'group' --- tail_build/Makefile | 37 +++++++++++++++++++++++++++++++++++++ tail_build/README | 21 +++++++++++++++++++++ tail_build/prj/build.lst | 2 ++ tail_build/prj/d.lst | 0 tail_build/prj/makefile.mk | 40 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 100 insertions(+) create mode 100644 tail_build/Makefile create mode 100644 tail_build/README create mode 100644 tail_build/prj/build.lst create mode 100644 tail_build/prj/d.lst create mode 100644 tail_build/prj/makefile.mk (limited to 'tail_build') diff --git a/tail_build/Makefile b/tail_build/Makefile new file mode 100644 index 000000000000..c4a6356fada0 --- /dev/null +++ b/tail_build/Makefile @@ -0,0 +1,37 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(SRC_ROOT)/Module_tail_build.mk)) + +# vim: set noet sw=4 ts=4: diff --git a/tail_build/README b/tail_build/README new file mode 100644 index 000000000000..1639f7837ad7 --- /dev/null +++ b/tail_build/README @@ -0,0 +1,21 @@ + +This module exist only to take advantage of the ability of gbuild to build +multiple modules in one single Makefile. + +A few module that normally get built at the end of the build process +are already converted. this 'pseudo-module' build them all as one. + +As module get converted to gbuild they can be added to this module +if they fix the neceesary pre-requisite. that is: + +To qualify a module must not be the dependant of any other module, +except postprocess or if the other module itself is under tail_build + +To migrate a module under tail_build, one should: + +Merge the dependencies declared in /prj/build.lst into tail_build/prj/build.lst +Remove the module from postprocess/prj/build.lst dependencies + +Add the module name in Module_tail_build.mk at the root of bootstrap + + diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst new file mode 100644 index 000000000000..ea7813e30cff --- /dev/null +++ b/tail_build/prj/build.lst @@ -0,0 +1,2 @@ +tb tail_build : BOOST:boost LIBXSLT:libxslt MDDS:mdds MESA:Mesa TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper fileaccess filter lotuswordpro offapi offuh oovbaapi oox package qadevOOo sal sfx2 soltools stoc stoc svtools svx test toolkit tools ucbhelper unotools unoxml unoxml ure uui vbahelper vcl writerperfect xmlscript NULL +tb tail_build\prj nmake - all tb_prj NULL diff --git a/tail_build/prj/d.lst b/tail_build/prj/d.lst new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tail_build/prj/makefile.mk b/tail_build/prj/makefile.mk new file mode 100644 index 000000000000..e312a7ccab65 --- /dev/null +++ b/tail_build/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog -- cgit From b5f1bb93179c600acdd7956a380b12912f143e1e Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 27 Apr 2011 07:55:38 +0200 Subject: added modules must be removed from tail_build's deps too --- tail_build/README | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'tail_build') diff --git a/tail_build/README b/tail_build/README index 1639f7837ad7..4e29fb139ffb 100644 --- a/tail_build/README +++ b/tail_build/README @@ -1,4 +1,3 @@ - This module exist only to take advantage of the ability of gbuild to build multiple modules in one single Makefile. @@ -12,10 +11,7 @@ To qualify a module must not be the dependant of any other module, except postprocess or if the other module itself is under tail_build To migrate a module under tail_build, one should: - -Merge the dependencies declared in /prj/build.lst into tail_build/prj/build.lst -Remove the module from postprocess/prj/build.lst dependencies - -Add the module name in Module_tail_build.mk at the root of bootstrap - - +* merge the dependencies declared in /prj/build.lst into tail_build/prj/build.lst +* remove the module from postprocess/prj/build.lst dependencies +* remove the module from tail_build/prj/build.lst dependencies +* add the module name in Module_tail_build.mk at the root of bootstrap -- cgit From e45934828a9a675799d8d3978451cf7c0e1b173b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 27 Apr 2011 07:56:39 +0200 Subject: add lotuswordpro to tail build --- tail_build/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tail_build') diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index ea7813e30cff..350ebbc59ce1 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BOOST:boost LIBXSLT:libxslt MDDS:mdds MESA:Mesa TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper fileaccess filter lotuswordpro offapi offuh oovbaapi oox package qadevOOo sal sfx2 soltools stoc stoc svtools svx test toolkit tools ucbhelper unotools unoxml unoxml ure uui vbahelper vcl writerperfect xmlscript NULL +tb tail_build : BOOST:boost LIBXSLT:libxslt MDDS:mdds MESA:Mesa TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper fileaccess filter offapi offuh oovbaapi oox package qadevOOo sal sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools unoxml unoxml ure uui vbahelper vcl writerperfect xmlscript NULL tb tail_build\prj nmake - all tb_prj NULL -- cgit From 9a1612998c7e6aa575cac40770cfeca0c2f2267c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 27 Apr 2011 08:00:49 +0200 Subject: add unoxml to tail build --- tail_build/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tail_build') diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 350ebbc59ce1..5cd40998a00e 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BOOST:boost LIBXSLT:libxslt MDDS:mdds MESA:Mesa TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper fileaccess filter offapi offuh oovbaapi oox package qadevOOo sal sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools unoxml unoxml ure uui vbahelper vcl writerperfect xmlscript NULL +tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper fileaccess filter offapi offuh oovbaapi oox package qadevOOo sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript NULL tb tail_build\prj nmake - all tb_prj NULL -- cgit From 52ac857a9f3e5be630ccdf7e729aa00feb06e549 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 27 Apr 2011 08:06:47 +0200 Subject: add fileaccess to tail build --- tail_build/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tail_build') diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 5cd40998a00e..65eda027916d 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper fileaccess filter offapi offuh oovbaapi oox package qadevOOo sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript NULL +tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi offuh oovbaapi oox package qadevOOo rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript NULL tb tail_build\prj nmake - all tb_prj NULL -- cgit