Makefile.build | 2 Module_tail_build.mk | 271 ------------------------------------ RepositoryModule.mk | 271 ++++++++++++++++++++++++++++++++++++ solenv/gbuild/Module.mk | 2 solenv/gbuild/tail_build_modules.mk | 52 ------ 5 files changed, 273 insertions(+), 325 deletions(-)
New commits: commit 2ee838d7ad7091fb3e24f362d791b7b59ca983f7 Author: Michael Stahl <[email protected]> Date: Fri Mar 1 00:54:25 2013 +0100 rename Module_tail_build to RepositoryModule Change-Id: I06783d26f10efabd1aca06a7a1e0647d8ed58b69 diff --git a/Makefile.build b/Makefile.build index a13aa83..322a7d7 100644 --- a/Makefile.build +++ b/Makefile.build @@ -14,6 +14,6 @@ endif gb_Side := host include $(SOLARENV)/gbuild/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk)) +$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule.mk)) # vim: set noet sw=4 ts=4: diff --git a/Module_tail_build.mk b/Module_tail_build.mk deleted file mode 100644 index 538c5de..0000000 --- a/Module_tail_build.mk +++ /dev/null @@ -1,271 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Norbert Thiebaud <[email protected]> (C) 2011, All Rights Reserved. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - - -$(eval $(call gb_Module_Module,tail_build)) - -$(eval $(call gb_Module_add_moduledirs,tail_build,\ - accessibility \ - $(call gb_Helper_optional,AFMS,afms) \ - android \ - animations \ - $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ - apple_remote \ - autodoc \ - avmedia \ - basctl \ - basebmp \ - basegfx \ - basic \ - bean \ - $(call gb_Helper_optional,BOOST,boost) \ - $(call gb_Helper_optional,BSH,beanshell) \ - binaryurp \ - $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ - bridges \ - $(call gb_Helper_optional,CAIRO,cairo) \ - canvas \ - chart2 \ - cli_ure \ - $(call gb_Helper_optional,CLUCENE,clucene) \ - $(call gb_Helper_optional,DESKTOP,codemaker) \ - comphelper \ - configmgr \ - connectivity \ - cosv \ - cppcanvas \ - cppu \ - cppuhelper \ - $(call gb_Helper_optional,CPPUNIT,cppunit) \ - cpputools \ - $(call gb_Helper_optional,CRASHREP,crashrep) \ - $(call gb_Helper_optional,CT2N,ct2n) \ - cui \ - $(call gb_Helper_optional,CURL,curl) \ - dbaccess \ - desktop \ - $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ - dtrans \ - drawinglayer \ - editeng \ - embeddedobj \ - embedserv \ - $(call gb_Helper_optional,EPM,epm) \ - eventattacher \ - $(call gb_Helper_optional,EXPAT,expat) \ - extensions \ - external \ - extras \ - fileaccess \ - filter \ - $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ - forms \ - formula \ - fpicker \ - framework \ - $(call gb_Helper_optional,FREETYPE,freetype) \ - $(call gb_Helper_optional,GRAPHITE,graphite) \ - $(call gb_Helper_optional,DESKTOP,helpcompiler) \ - $(call gb_Helper_optional,HELP,helpcontent2) \ - $(call gb_Helper_optional,HSQLDB,hsqldb) \ - $(call gb_Helper_optional,HUNSPELL,hunspell) \ - hwpfilter \ - $(call gb_Helper_optional,HYPHEN,hyphen) \ - i18npool \ - i18nutil \ - $(call gb_Helper_optional,ICU,icu) \ - idl \ - $(call gb_Helper_optional,DESKTOP,idlc) \ - instsetoo_native \ - io \ - ios \ - javaunohelper \ - $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ - $(call gb_Helper_optional,JPEG,jpeg) \ - jurt \ - jvmaccess \ - jvmfwk \ - $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ - $(call gb_Helper_optional,LCMS2,lcms2) \ - $(call gb_Helper_optional,CDR,libcdr) \ - $(call gb_Helper_optional,CMIS,libcmis) \ - $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ - $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ - $(call gb_Helper_optional,LIBPNG,libpng) \ - $(call gb_Helper_optional,MSPUB,libmspub) \ - $(call gb_Helper_optional,ORCUS,liborcus) \ - librelogo \ - $(call gb_Helper_optional,VISIO,libvisio) \ - $(call gb_Helper_optional,WPD,libwpd) \ - $(call gb_Helper_optional,WPG,libwpg) \ - $(call gb_Helper_optional,WPS,libwps) \ - $(call gb_Helper_optional,LIBXML2,libxml2) \ - libxmlsec \ - $(call gb_Helper_optional,LIBXSLT,libxslt) \ - lingucomponent \ - linguistic \ - lotuswordpro \ - $(call gb_Helper_optional,LPSOLVE,lpsolve) \ - $(call gb_Helper_optional,DESKTOP,l10ntools) \ - MathMLDTD \ - $(call gb_Helper_optional,MDDS,mdds) \ - Mesa \ - $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ - $(call gb_Helper_optional,MOZ,moz) \ - $(call gb_Helper_optional,MYSQLC,mysqlc) \ - $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ - $(call gb_Helper_optional,MYTHES,mythes) \ - $(call gb_Helper_optional,NEON,neon) \ - $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ - np_sdk \ - $(call gb_Helper_optional,NSS,nss) \ - o3tl \ - $(call gb_Helper_optional,ODK,odk) \ - offapi \ - officecfg \ - oovbaapi \ - oox \ - $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ - package \ - padmin \ - $(call gb_Helper_optional,POSTGRESQL,postgresql) \ - postprocess \ - psprint_config \ - $(call gb_Helper_optional,PYTHON,python3) \ - $(call gb_Helper_optional,PYUNO,pyuno) \ - $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ - readlicense_oo \ - $(call gb_Helper_optional,REDLAND,redland) \ - registry \ - remotebridges \ - reportbuilder \ - reportdesign \ - $(call gb_Helper_optional,RHINO,rhino) \ - ridljar \ - rsc \ - sal \ - salhelper \ - sane \ - sax \ - sc \ - scaddins \ - sccomp \ - $(call gb_Helper_optional,DESKTOP,scp2) \ - scripting \ - sd \ - sdext \ - $(call gb_Helper_optional,DESKTOP,setup_native) \ - sfx2 \ - shell \ - slideshow \ - smoketest \ - solenv \ - soltools \ - sot \ - starmath \ - stoc \ - store \ - svl \ - svtools \ - svgio \ - svx \ - sw \ - swext \ - sysui \ - test \ - testtools \ - $(call gb_Helper_optional,TOMCAT,tomcat) \ - toolkit \ - tools \ - touch \ - tubes \ - twain \ - ucb \ - ucbhelper \ - $(call gb_Helper_optional,UCPP,ucpp) \ - udkapi \ - udm \ - unixODBC \ - UnoControls \ - unodevtools \ - unoil \ - unoidl \ - unotest \ - unotools \ - unoxml \ - ure \ - uui \ - vbahelper \ - vcl \ - $(call gb_Helper_optional,VIGRA,vigra) \ - wizards \ - writerfilter \ - writerperfect \ - $(call gb_Helper_optional,X11_EXTENSIONS,x11_extensions) \ - xmerge \ - $(call gb_Helper_optional,DESKTOP,xmlhelp) \ - xmloff \ - $(call gb_Helper_optional,XPDF,xpdf) \ - xmlreader \ - xmlscript \ - xmlsecurity \ - $(call gb_Helper_optional,XSLTML,xsltml) \ - $(call gb_Helper_optional,ZLIB,zlib) \ -)) - -ifeq ($(MERGELIBS),TRUE) -$(eval $(call gb_Module_add_targets,tail_build,\ - Library_merged \ -)) -endif - -# Especially when building everything with symbols, the linking of the largest -# libraries takes enormous amounts of RAM. To prevent annoying OOM situations -# etc., try to prevent linking these in parallel by adding artificial build -# order dependencies here. -define tailbuild_serialize1 -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) \ - :| $(foreach lib,$(2),$(call gb_Library_get_target,$(lib))) -endef - -define tailbuild_serialize -$(if $(filter-out 0 1,$(words $(1))),\ -$(call tailbuild_serialize1,$(firstword $(1)),$(wordlist 2,$(words $(1)),$(1)))) -$(if $(strip $(1)),\ -$(call tailbuild_serialize,$(wordlist 2,$(words $(1)),$(1)))) -endef - -ifeq (all,$(filter all,$(MAKECMDGOALS))) -$(eval $(call tailbuild_serialize,\ - scfilt \ - $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ - sc msword swui sw sd \ - $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ - writerfilter cui chartcontroller oox \ - $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \ - xo vcl \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/RepositoryModule.mk b/RepositoryModule.mk new file mode 100644 index 0000000..8050e46 --- /dev/null +++ b/RepositoryModule.mk @@ -0,0 +1,271 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Norbert Thiebaud <[email protected]> (C) 2011, All Rights Reserved. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + + +$(eval $(call gb_Module_Module,libreoffice)) + +$(eval $(call gb_Module_add_moduledirs,libreoffice,\ + accessibility \ + $(call gb_Helper_optional,AFMS,afms) \ + android \ + animations \ + $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ + apple_remote \ + autodoc \ + avmedia \ + basctl \ + basebmp \ + basegfx \ + basic \ + bean \ + $(call gb_Helper_optional,BOOST,boost) \ + $(call gb_Helper_optional,BSH,beanshell) \ + binaryurp \ + $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \ + bridges \ + $(call gb_Helper_optional,CAIRO,cairo) \ + canvas \ + chart2 \ + cli_ure \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional,DESKTOP,codemaker) \ + comphelper \ + configmgr \ + connectivity \ + cosv \ + cppcanvas \ + cppu \ + cppuhelper \ + $(call gb_Helper_optional,CPPUNIT,cppunit) \ + cpputools \ + $(call gb_Helper_optional,CRASHREP,crashrep) \ + $(call gb_Helper_optional,CT2N,ct2n) \ + cui \ + $(call gb_Helper_optional,CURL,curl) \ + dbaccess \ + desktop \ + $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ + dtrans \ + drawinglayer \ + editeng \ + embeddedobj \ + embedserv \ + $(call gb_Helper_optional,EPM,epm) \ + eventattacher \ + $(call gb_Helper_optional,EXPAT,expat) \ + extensions \ + external \ + extras \ + fileaccess \ + filter \ + $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ + forms \ + formula \ + fpicker \ + framework \ + $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,GRAPHITE,graphite) \ + $(call gb_Helper_optional,DESKTOP,helpcompiler) \ + $(call gb_Helper_optional,HELP,helpcontent2) \ + $(call gb_Helper_optional,HSQLDB,hsqldb) \ + $(call gb_Helper_optional,HUNSPELL,hunspell) \ + hwpfilter \ + $(call gb_Helper_optional,HYPHEN,hyphen) \ + i18npool \ + i18nutil \ + $(call gb_Helper_optional,ICU,icu) \ + idl \ + $(call gb_Helper_optional,DESKTOP,idlc) \ + instsetoo_native \ + io \ + ios \ + javaunohelper \ + $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ + $(call gb_Helper_optional,JPEG,jpeg) \ + jurt \ + jvmaccess \ + jvmfwk \ + $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ + $(call gb_Helper_optional,LCMS2,lcms2) \ + $(call gb_Helper_optional,CDR,libcdr) \ + $(call gb_Helper_optional,CMIS,libcmis) \ + $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ + $(call gb_Helper_optional,LIBPNG,libpng) \ + $(call gb_Helper_optional,MSPUB,libmspub) \ + $(call gb_Helper_optional,ORCUS,liborcus) \ + librelogo \ + $(call gb_Helper_optional,VISIO,libvisio) \ + $(call gb_Helper_optional,WPD,libwpd) \ + $(call gb_Helper_optional,WPG,libwpg) \ + $(call gb_Helper_optional,WPS,libwps) \ + $(call gb_Helper_optional,LIBXML2,libxml2) \ + libxmlsec \ + $(call gb_Helper_optional,LIBXSLT,libxslt) \ + lingucomponent \ + linguistic \ + lotuswordpro \ + $(call gb_Helper_optional,LPSOLVE,lpsolve) \ + $(call gb_Helper_optional,DESKTOP,l10ntools) \ + MathMLDTD \ + $(call gb_Helper_optional,MDDS,mdds) \ + Mesa \ + $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ + $(call gb_Helper_optional,MOZ,moz) \ + $(call gb_Helper_optional,MYSQLC,mysqlc) \ + $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ + $(call gb_Helper_optional,MYTHES,mythes) \ + $(call gb_Helper_optional,NEON,neon) \ + $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ + np_sdk \ + $(call gb_Helper_optional,NSS,nss) \ + o3tl \ + $(call gb_Helper_optional,ODK,odk) \ + offapi \ + officecfg \ + oovbaapi \ + oox \ + $(call gb_Helper_optional,OPENLDAP,openldap) \ + $(call gb_Helper_optional,OPENSSL,openssl) \ + package \ + padmin \ + $(call gb_Helper_optional,POSTGRESQL,postgresql) \ + postprocess \ + psprint_config \ + $(call gb_Helper_optional,PYTHON,python3) \ + $(call gb_Helper_optional,PYUNO,pyuno) \ + $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ + readlicense_oo \ + $(call gb_Helper_optional,REDLAND,redland) \ + registry \ + remotebridges \ + reportbuilder \ + reportdesign \ + $(call gb_Helper_optional,RHINO,rhino) \ + ridljar \ + rsc \ + sal \ + salhelper \ + sane \ + sax \ + sc \ + scaddins \ + sccomp \ + $(call gb_Helper_optional,DESKTOP,scp2) \ + scripting \ + sd \ + sdext \ + $(call gb_Helper_optional,DESKTOP,setup_native) \ + sfx2 \ + shell \ + slideshow \ + smoketest \ + solenv \ + soltools \ + sot \ + starmath \ + stoc \ + store \ + svl \ + svtools \ + svgio \ + svx \ + sw \ + swext \ + sysui \ + test \ + testtools \ + $(call gb_Helper_optional,TOMCAT,tomcat) \ + toolkit \ + tools \ + touch \ + tubes \ + twain \ + ucb \ + ucbhelper \ + $(call gb_Helper_optional,UCPP,ucpp) \ + udkapi \ + udm \ + unixODBC \ + UnoControls \ + unodevtools \ + unoil \ + unoidl \ + unotest \ + unotools \ + unoxml \ + ure \ + uui \ + vbahelper \ + vcl \ + $(call gb_Helper_optional,VIGRA,vigra) \ + wizards \ + writerfilter \ + writerperfect \ + $(call gb_Helper_optional,X11_EXTENSIONS,x11_extensions) \ + xmerge \ + $(call gb_Helper_optional,DESKTOP,xmlhelp) \ + xmloff \ + $(call gb_Helper_optional,XPDF,xpdf) \ + xmlreader \ + xmlscript \ + xmlsecurity \ + $(call gb_Helper_optional,XSLTML,xsltml) \ + $(call gb_Helper_optional,ZLIB,zlib) \ +)) + +ifeq ($(MERGELIBS),TRUE) +$(eval $(call gb_Module_add_targets,libreoffice,\ + Library_merged \ +)) +endif + +# Especially when building everything with symbols, the linking of the largest +# libraries takes enormous amounts of RAM. To prevent annoying OOM situations +# etc., try to prevent linking these in parallel by adding artificial build +# order dependencies here. +define repositorymodule_serialize1 +$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) \ + :| $(foreach lib,$(2),$(call gb_Library_get_target,$(lib))) +endef + +define repositorymodule_serialize +$(if $(filter-out 0 1,$(words $(1))),\ +$(call repositorymodule_serialize1,$(firstword $(1)),$(wordlist 2,$(words $(1)),$(1)))) +$(if $(strip $(1)),\ +$(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1)))) +endef + +ifeq (all,$(filter all,$(MAKECMDGOALS))) +$(eval $(call repositorymodule_serialize,\ + scfilt \ + $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ + sc msword swui sw sd \ + $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ + writerfilter cui chartcontroller oox \ + $(if $(filter TRUE,$(MERGELIBS)),merged,svxcore) \ + xo vcl \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index ade89fc..9f545a4 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -154,7 +154,7 @@ gb_Module__debug_enabled = \ $(filter all $(1)/,$(ENABLE_DEBUGINFO_FOR))) define gb_Module_Module -$(if $(filter-out tail_build instsetoo_native android ios,$(1)),$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call gb_Module_get_target,$(1))) +$(if $(filter-out libreoffice instsetoo_native android ios,$(1)),$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call gb_Module_get_target,$(1))) gb_Module_ALLMODULES += $(1) gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST)))) gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK) commit 117700c213b3a612b2c7498ebeb014c3e998c4ac Author: Michael Stahl <[email protected]> Date: Fri Mar 1 00:43:59 2013 +0100 remove unused solenv/gbuild/tail_build_modules.mk Change-Id: I2c3d8a793f1ce59a2fab9e9511df99222c97fb5b diff --git a/solenv/gbuild/tail_build_modules.mk b/solenv/gbuild/tail_build_modules.mk deleted file mode 100644 index 2ce60fd..0000000 --- a/solenv/gbuild/tail_build_modules.mk +++ /dev/null @@ -1,52 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <[email protected]> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -TAIL_BUILD_MODULES := - -gb_Module_Module := - -define gb_Helper_optional -$(if $(filter $(1),$(BUILD_TYPE)),$(2)) -endef - -define gb_Module_add_moduledirs -TAIL_BUILD_MODULES += $(2) - -endef - -ifneq ($(value TAIL_BUILD_MK),) -include $(TAIL_BUILD_MK) -else -$(error TAIL_BUILD_MK must be set to path to Module_tail_build.mk) -endif - -.PHONY : get_modules - -get_modules : - @echo $(TAIL_BUILD_MODULES) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
