Makefile.build | 17 ++
Makefile.in | 67 ++---------
Makefile.post | 11 -
RepositoryModule_ooo.mk | 240 ----------------------------------------
solenv/bin/callcatcher.Makefile | 5
tail_build/Makefile | 21 ---
tail_build/README | 21 ---
tail_build/prj/build.lst | 2
8 files changed, 35 insertions(+), 349 deletions(-)
New commits:
commit f2e7365ebc9aecb4cd9e56414ffab6023400ba67
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Feb 27 18:40:36 2013 +0100
various small cleanups
Change-Id: I81898c622279e97403efa05d7d2179102db6676a
diff --git a/Makefile.in b/Makefile.in
index 3ac4c88..7cd9548 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-.PHONY : all bootstrap build check clean clean-build clean-host dev-install
distclean distro-pack-install docs download fetch findunusedcode get-submodules
help id install install-strip install-tb subsequentcheck tags
+.PHONY : all bootstrap build check clean clean-build clean-host dev-install
distclean distro-pack-install docs download fetch findunusedcode get-submodules
id install install-strip install-tb subsequentcheck tags
ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS:=all
@@ -46,11 +46,10 @@ else # MAKE_RESTARTS
all: build
ifeq ($(gb_Side),)
-export gb_Side:=host
+gb_Side := host
endif
include $(BUILDDIR)/config_$(gb_Side).mk
-SRCDIR:=$(SRC_ROOT)
ifeq ($(GMAKE_OPTIONS),)
ifeq ($(verbose)$(VERBOSE),)
@@ -60,17 +59,9 @@ export GMAKE_OPTIONS:=-r
endif
endif
-# This list tells which modules are gbuild ones. It does *not* tell which
modules to build. That is directed
-# by the module being mentioned in postprocess/prj/build.lst, etc, recursively.
-$(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(BUILDDIR)/config_host.mk
- mkdir -p $(dir $@)
- echo "gbuild_modules:= tail_build \\" > $@
- for m in `cd $(SRCDIR) && ls */Module_*.mk`; do echo $$m | sed -e
's/\/.*$$/ \\/'; done >> $@
- echo >> $@
-
--include $(WORKDIR)/modules.mk
-include $(SRCDIR)/solenv/gbuild/Output.mk
-
+#
+# Partial Build
+#
define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables
$(1).subsequentcheck
@@ -92,11 +83,7 @@ define gbuild_modules_rules
$(foreach m,$(1),$(call gbuild_module_rules,$(m)))
endef
-
-#
-# Partial Build
-#
-$(eval $(call gbuild_modules_rules,$(gbuild_modules)))
+$(eval $(call gbuild_modules_rules,$(filter-out Module%,$(subst /, ,$(subst
$(SRCDIR)/,,$(wildcard $(SRCDIR)/*/Module_*.mk))))))
# run a JunitTest - relies on naming convention (module prefix)
$(WORKDIR)/JunitTest/%/done :
@@ -107,12 +94,6 @@ $(WORKDIR)/CppunitTest/%.test :
cd $(firstword $(subst _, ,$*)) && $(GNUMAKE) $(GMAKE_OPTIONS) $@
#
-# Help
-#
-help:
- @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
-
-#
# Clean
#
clean: clean-host clean-build
@@ -121,14 +102,12 @@ clean-host:
rm -fr $(DEVINSTALLDIR)
rm -fr $(OUTDIR)
rm -fr $(WORKDIR)
- rm -fr $(SRCDIR)/*/$(INPATH)
- rm -fr $(SRCDIR)/solenv/$(OUTPATH)
rm -fr install
clean-build:
ifeq ($(CROSS_COMPILING),YES)
- rm -rf $(SOLARVER)/$(INPATH_FOR_BUILD) # not necessarily below SRCDIR
- rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
+ rm -fr $(OUTDIR_FOR_BUILD)
+ rm -fr $(WORKDIR_FOR_BUILD)
endif
include $(SRCDIR)/compilerplugins/Makefile.mk
@@ -157,13 +136,9 @@ distclean : clean compilerplugins-clean
#
# custom command
#
-ifneq ( $(MAKECMDGOALS),cmd)
cmd:
echo "custom cmd" && ( $(cmd) )
-endif
-
-ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),)
#
# Fetch
#
@@ -416,12 +391,10 @@ check: dev-install subsequentcheck
subsequentcheck :| $(if $(filter-out
subsequentcheck,$(MAKECMDGOALS)),dev-install)
$(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.build $@
-.PHONY : unitcheck slowcheck debugrun translations
-unitcheck slowcheck debugrun translations:
+.PHONY : debugrun help slowcheck translations unitcheck
+debugrun help slowcheck translations unitcheck :
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.build $@
-endif # not clean or distclean
-
endif # MAKE_RESTARTS
# vim: set noet sw=4 ts=4:
commit bdd921453e0ea9d94f2bfd15dd72a984935552d5
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Feb 26 15:15:22 2013 +0100
remove RepositoryModule_ooo.mk duplicated by Module_tail_build.mk
Also remove pseudo-module tail_build. All we need is one makefile.
Change-Id: Idb7f3a15db33adf4398136a142f175094ef4bc6c
diff --git a/Makefile.build b/Makefile.build
new file mode 100644
index 0000000..857eb25
--- /dev/null
+++ b/Makefile.build
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))config_host.mk
+
+gb_Side := host
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Makefile.in b/Makefile.in
index 6fa38d5..3ac4c88 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,29 +71,21 @@ $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk)
$(BUILDDIR)/config_host.mk
-include $(WORKDIR)/modules.mk
include $(SRCDIR)/solenv/gbuild/Output.mk
-export gb_TAILBUILDTARGET=all slowcheck
-
define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables
$(1).subsequentcheck
$(1): bootstrap fetch
cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
-$(1).all: bootstrap fetch
- $$(if $$(filter $(1),$$(shell $(GNUMAKE) -r -f
$(SRCDIR)/tail_build/Makefile showmodules)), \
- cd $(SRC_ROOT)/tail_build && unset MAKEFLAGS && \
- export gb_TAILBUILDTARGET="$(WORKDIR)/Module/$(1)
$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)" && \
- , \
- cd $(SRC_ROOT)/$(1) && unset MAKEFLAGS && \
- ) \
- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
-
$(1).build $(1).check $(1).clean $(1).showdeliverables:
cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst
$(1).%,%,$$@)
$(1).subsequentcheck:
cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS)
subsequentcheck
+$(1).all: bootstrap fetch
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.build $(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1)
$(WORKDIR)/Module/slowcheck/$(1)
+
endef
define gbuild_modules_rules
@@ -228,7 +220,7 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
# Ditto for dbconnectivity in the --disable-database-connectivity case
$(GNUMAKE) connectivity
endif
- cd $(SRCDIR)/tail_build && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.build all slowcheck
ifeq ($(OS),ANDROID)
cd android && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
endif
@@ -422,11 +414,11 @@ findunusedcode:
check: dev-install subsequentcheck
subsequentcheck :| $(if $(filter-out
subsequentcheck,$(MAKECMDGOALS)),dev-install)
- $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRC_ROOT)/Makefile.post $@
+ $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.build $@
.PHONY : unitcheck slowcheck debugrun translations
unitcheck slowcheck debugrun translations:
- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRC_ROOT)/Makefile.post $@
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.build $@
endif # not clean or distclean
diff --git a/Makefile.post b/Makefile.post
deleted file mode 100644
index 76ea25b..0000000
--- a/Makefile.post
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))config_host.mk
-endif
-
-include $(SOLARENV)/gbuild/gbuild.mk
-
-$(eval $(call gb_Module_make_global_targets,$(wildcard
$(SRCDIR)/RepositoryModule_*.mk)))
-
-# vim: set noet sw=4 ts=4:
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
deleted file mode 100644
index 23b5e11..0000000
--- a/RepositoryModule_ooo.mk
+++ /dev/null
@@ -1,240 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Module_Module,ooo))
-
-$(eval $(call gb_Module_add_moduledirs,ooo,\
- 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,BSH,beanshell) \
- binaryurp \
- $(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \
- $(call gb_Helper_optional,BOOST,boost) \
- 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) \
- drawinglayer \
- dtrans \
- 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) \
- io \
- ios \
- javaunohelper \
- $(call gb_Helper_optional,JFREEREPORT,jfreereport) \
- jurt \
- $(call gb_Helper_optional,JPEG,jpeg) \
- jvmaccess \
- jvmfwk \
- $(call gb_Helper_optional,DESKTOP,l10ntools) \
- $(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,MSPUB,libmspub) \
- $(call gb_Helper_optional,ORCUS,liborcus) \
- $(call gb_Helper_optional,LIBPNG,libpng) \
- 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) \
- libxmlsec \
- $(call gb_Helper_optional,LIBXSLT,libxslt) \
- $(call gb_Helper_optional,LIBXML2,libxml2) \
- lingucomponent \
- linguistic \
- lotuswordpro \
- $(call gb_Helper_optional,LPSOLVE,lpsolve) \
- 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 \
- svgio \
- svl \
- svtools \
- 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) \
-))
-
-# vim: set noet ts=4 sw=4:
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index f5a0edb..f915750 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -30,10 +30,9 @@ export dbglevel:=2
include $(SOLARENV)/gbuild/gbuild.mk
findunusedcode:
- cd $(SRCDIR)/postprocess && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.build
ooinstall -l $(DEVINSTALLDIR)/opt
- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post
subsequentcheck
+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.build
subsequentcheck
callanalyse \
$(WORKDIR)/LinkTarget/*/* \
*/$(OUTPATH)/bin/* \
diff --git a/tail_build/Makefile b/tail_build/Makefile
deleted file mode 100644
index 20bbfb1..0000000
--- a/tail_build/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-ifeq ($(strip $(SOLARENV)),)
-ifeq ($(gb_Side),)
-gb_Side:=host
-endif
-include $(dir $(realpath $(firstword
$(MAKEFILE_LIST))))/../config_$(gb_Side).mk
-endif
-
-include $(SOLARENV)/gbuild/gbuild.mk
-
-$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk))
-
-# vim: set noet sw=4 ts=4:
diff --git a/tail_build/README b/tail_build/README
deleted file mode 100644
index 4ce9228..0000000
--- a/tail_build/README
+++ /dev/null
@@ -1,21 +0,0 @@
-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 necessary 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 <foo> under tail_build, one should:
-* merge the dependencies declared in <foo>/prj/build.lst into
tail_build/prj/build.lst
-* remove the module <foo> from postprocess/prj/build.lst dependencies
-* remove the module <foo> from tail_build/prj/build.lst dependencies
-* add the module name in Module_tail_build.mk in the root of the tree.
-
-This module of course, takes a lot of thought, and dependency work /
-statting until it has finished it's business, knows exactly what to
-re-build, and can start building just that.
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
deleted file mode 100644
index 8a04042..0000000
--- a/tail_build/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-tb tail_build : NULL
-tb tail_build\prj nmake - all tb_prj NULL
diff --git a/tail_build/prj/d.lst b/tail_build/prj/d.lst
deleted file mode 100644
index e69de29..0000000
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
