[Libreoffice-commits] .: 2 commits - Makefile.in solenv/gbuild

[Bjoern Michaelsen]

 Makefile.in                                     |    1 -
 solenv/gbuild/extensions/post_BuildplTargets.mk |   13 ++++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 367d0be3e77f38604eeef1d9ae8a2a8c848bccbe
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Nov 29 13:08:15 2011 +0100

    remove allcheck cruft from Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b1680f3..1375db4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,5 +104,4 @@ findunusedcode:
 #as long as we are not completely gbuildified we need to explicitly depend on the build/install
 unitcheck: build
 subsequentcheck: dev-install
-allcheck : dev-install
 #debugrun : dev-install # disabled for now, this dep seems to poison the debugrun !?
commit a0732d042f7304abb5c7194adcb8bf1948c96d55
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Nov 29 13:07:22 2011 +0100

    do incemental build from instsetoo_native to smoketest, if both are needed

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 74ce553..592f590 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -52,20 +52,23 @@ gb_MAKETARGET=build
 endif
 endif
 
+gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
-cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) $(2) -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
+$(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
 endef
 
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build
 
-smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
-	$(call gb_BuildplTarget_command,$@)
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | instsetoo_native
+	$(call gb_BuildplTarget_command,$@,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from instsetoo_native,--all))
+	echo $@
 
 instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
-	$(call gb_BuildplTarget_command,$@)
+	$(call gb_BuildplTarget_command,$@,--all)
 
 cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
-	source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@)
+	source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@,--all)
 
 dev-install: smoketestoo_native