moved some more targets to gbuild

Makefile.in

@@ -15,62 +15,71 @@ else
 gb_MAKETARGET=all
 endif
 
-.PHONY : build dev-install all cross-build-toolset install distro-pack-install clean clean-host clean-build distclean findunusedcode
+.PHONY : build dev-install all cross-build-toolset install distro-pack-install clean clean-host clean-build distclean findunusedcode bootstrap
+
+define forward_to_gbuild
+@GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk \
+	$(if @VERBOSE@,,-s) \
+	--jobs="@GMAKE_PARALLELISM@" \
+	$(patsubst allcheck,check,$(1))
+endef
+
+define forward_to_buildpl
+. ./Env.Host.sh && cd $(1) && gb_MAKETARGET=$(gb_MAKETARGET) build.pl -P@BUILD_NCPUS@ -- -P@BUILD_MAX_JOBS@
+endef
 
-all: build unitcheck
-	@echo
-	@echo "LibreOffice build succesfully finished :-)"
-	@echo
 ifeq (@CROSS_COMPILING@,YES)
-	@echo "Please consult README.cross how to install it."
+define all_install
+To install, issue: @GNUMAKE@ install
+Developers might prefer this way: @GNUMAKE@ dev-install -o build
+To run smoketest, issue: @GNUMAKE@ check
+endef
 else
-	@echo "To install, issue: @GNUMAKE@ install"
-	@echo "Developers might prefer this way: @GNUMAKE@ dev-install -o build"
-	@echo "To run smoketest, issue: @GNUMAKE@ check"
+allinstall=For crosscompiles, please consult README.cross how to install it.
 endif
-	@echo
 
-build: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE)
-	@. ./Env.Host.sh && \
-		cd instsetoo_native && \
-		gb_MAKETARGET=$(gb_MAKETARGET) build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+UNAMESYSTEM=$(shell uname -s)
 
-dev-install: build
-	@. ./Env.Host.sh && \
-            cd smoketestoo_native && \
-            build.pl -P@BUILD_NCPUS@ -- -P@BUILD_MAX_JOBS@ && \
+ifeq ($(UNAMESYSTEM),Linux)
+devinstall_run=make debugrun
+else
+ifeq ($(UNAMESYSTEM),Linux)
+devinstall_run=open @abs_builddir@/install/LibreOffice.app
+else
+define devinstall_run
+cd @abs_builddir@/install/program
+. ./ooenv
+./soffice.bin
+endef
+endif
+endif
+
+all: build unitcheck
+	$(info)
+	$(info LibreOffice build succesfully finished.)
+	$(info)
+	$(info $(all_install))
+	$(info)
+
+build: Makefile bootstrap src.downloaded $(CROSS_TOOLSET_RULE)
+	@$(call forward_to_buildpl,instsetoo_native)
+
+smoketest: Makefile bootstrap src.downloaded $(CROSS_TOOLSET_RULE)
+	@$(call forward_to_buildpl,smoketestoo_native) && \
             rm -f "@abs_builddir@"/install && \
-            ln -s "$$SOLARVER/$$INPATH"/installation/opt/ \
-                "@abs_builddir@"/install && \
-            printf '\n' && \
-            printf \
-                '\nDeveloper installation finished, you can now execute:\n\n' \
-                && \
-            if test `uname -s` = Linux; then \
-                printf 'make debugrun\n'; \
-            elif test `uname -s` = Darwin; then \
-                printf 'open %s/install/LibreOffice.app\n' "@abs_builddir@"; \
-            else \
-                printf 'cd %s/install/program\n. ./ooenv\n./soffice.bin\n' \
-                    "@abs_builddir@"; \
-            fi
+            ln -s "$$SOLARVER/$$INPATH"/installation/opt/ "@abs_builddir@"/install
 
-debugrun:
-	@ @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk debugrun
+dev-install: smoketest
+	$(info)
+	$(info Developer installation finished, you can now execute:)
+	$(info)
+	$(info $(devinstall_run))
 
 check : allcheck
 	@true
 
-%check:
-	@ @GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk -r \
-		$(if @VERBOSE@,,-s) --jobs="$(if \
-		   $(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
-		$(patsubst allcheck,check,$@)
-
 cross-build-toolset:
-	@. ./Env.Build.sh && \
-	cd cross_toolset && \
-	build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+	$(call forward_to_buildpl,cross_toolset)
 
 install: build
 	@. ./Env.Host.sh && \
@@ -80,12 +89,6 @@ install: build
 	echo "Installation finished, you can now execute:" && \
 	echo "@INSTALLDIR@/program/soffice"
 
-distro-pack-install: install
-	./bin/distro-install-clean-up
-	./bin/distro-install-desktop-integration
-	./bin/distro-install-sdk
-	./bin/distro-install-file-lists
-
 distclean: clean
 ifeq (@BUILD_DMAKE@,YES)
 	-test -f dmake/Makefile && $(MAKE) -C dmake distclean
@@ -113,37 +116,39 @@ ifeq (@CROSS_COMPILING@,YES)
 	rm -rf */$$INPATH_FOR_BUILD
 endif
 
-dmake/dmake@EXEEXT_FOR_BUILD@:
-	./bootstrap
-
-src.downloaded: ooo.lst download
 ifeq (@DO_FETCH_TARBALLS@,YES)
-	@. ./Env.Host.sh && \
-	$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
+fetch: src.downloaded
+	$(call forward_to_gbuild,$@)
 else
+fetch:
 	@echo "Automatic fetching of external tarballs is disabled."
 endif
 
-fetch: src.downloaded
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),distclean)
+ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
 Makefile: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
 	./autogen.sh
 endif
-endif
+
+bootstrap:
+	$(call forward_to_gbuild,$@)
+
+debugrun:
+	@$(call forward_to_gbuild,$@)
+
+%check:
+	@$(call forward_to_gbuild,$@)
+
+distro-pack-install: install
+	@$(call forward_to_gbuild,$@)
 
 id:
-	@. ./Env.Host.sh && \
-		create-ids
+	@$(call forward_to_gbuild,$@)
 
 tags:
-	@. ./Env.Host.sh && \
-		create-tags
+	@$(call forward_to_gbuild,$@)
 
 docs:
-	@. ./Env.Host.sh && \
-		mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
+	@$(call forward_to_gbuild,$@)
 
 findunusedcode:
 # experimental callcatcher target

solenv/gbuild/Module.mk

@@ -153,10 +153,6 @@ endif
 
 endef
 
-# Dont recurse in subdirs for help an debugrun
-
-ifeq ($(filter help debugrun,$(MAKECMDGOALS)),)
-
 define gb_Module_add_target
 $(call gb_Module__read_targetfile,$(1),$(2),target)
 
@@ -195,8 +191,6 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
 
-endif
-
 define gb_Module_add_moduledir
 include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
 $(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))

solenv/gbuild/extensions/post_SpeedUpTargets.mk

+#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#  
+#   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) 2011 Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (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.
+
+
+# speed up if no target need to parse all modules
+ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun,$(MAKECMDGOALS)),)
+gb_Module_add_target=
+gb_Module_add_check_target=
+gb_Module_add_subsequentcheck_target=
+gb_FULLDEPS=
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
+

solenv/gbuild/extensions/pre_AuxTargets.mk

+#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#  
+#   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) 2011 Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (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.
+
+.PHONY: id tags docs distro-pack-install fetch
+
+id:
+	@create-ids
+
+tags:
+	@create-tags
+
+docs:
+	@mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
+
+distro-pack-install: install
+	$(SRCDIR)/bin/distro-install-clean-up
+	$(SRCDIR)/bin/distro-install-desktop-integration
+	$(SRCDIR)/bin/distro-install-sdk
+	$(SRCDIR)/bin/distro-install-file-lists
+
+$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
+	@$(SRCDIR)/download $(SRCDIR)/ooo.lst && touch $@
+
+fetch: $(SRCDIR)/src.downloaded
+
+$(WORKDIR)/bootstrap:
+	@cd $(SRCDIR) && ./bootstrap
+	@touch $@
+
+bootstrap: $(WORKDIR)/bootstrap
+
+# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
+

solenv/gbuild/gbuild.mk

@@ -403,7 +403,7 @@ INTERACTIVE VARIABLES:
 endef
 
 .PHONY: help
-help :
+help:
 	$(info $(gb_HelpMessage))
 	@true
 

tail_build/Makefile

@@ -30,6 +30,8 @@ ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
 else
 
+gb_PARTIALBUILD=T
+
 include $(SOLARENV)/gbuild/gbuild.mk
 
 $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk))