some more work on staging buildpl in front of gbuild

solenv/gbuild/extensions/post_BuildplTargets.mk

@@ -29,6 +29,69 @@
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
 
+.DEFAULT_GOAL=all
+#include $(GBUILDDIR)/Module.mk
+
+.PHONY: build all
+
+all: build
+	@true
+        
+# fake targets -- whatever is requested from gbuild requires a full build before (dev-install for JunitTests)
+$(call gb_Package_get_target,%): build
+	@true
+
+$(call gb_Executable_get_target,%): build
+	@true
+
+$(call gb_Extension_get_target,%): build
+	@true
+
+$(call gb_ComponentsTarget_get_target,%): build
+	@true
+
+$(call gb_Jar_get_target,%): build
+	@true
+
+$(call gb_RdbTarget_get_target,%): build
+	@true
+
+$(call gb_Pyuno_get_target,%): build
+	@true
+
+$(call gb_WinResTarget_get_target,%): build
+	@true
+ 
+$(call gb_CppunitTest_get_target,%): build
+	@true
+
+$(call gb_Configuration_get_target,%): build
+	@true
+
+#$(call gb_StaticLibrary_get_target,%): build
+#	@true
+
+$(call gb_AllLangResTarget_get_target,%): build
+	@true
+
+$(call gb_ExternalLib_get_target,%): build
+	@true
+
+#$(call gb_Library_get_target,%): build
+#	@true
+
+$(call gb_Package_get_target,%): build
+	@true
+
+$(call gb_UnoApiTarget_get_target,%): build
+	@true
+
+$(call gb_Zip_get_target,%): build
+	@true
+
+$(call gb_JunitTest_get_target,%): dev-install
+	@true
+
 gb_MAKETARGET=all
 # if we have only build as target use build instead of all
 ifneq ($(strip $(MAKECMDGOALS)),)
@@ -39,7 +102,7 @@ endif
 
 gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
-cd $(SRCDIR)/$(1) && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl $(if $(findstring s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
+cd $(SRCDIR)/$(1) && unset MAKEFLAGS && export gb_SourceEnvAndRecurse_STAGE=gbuild && $(SOLARENV)/bin/build.pl $(if $(findstring s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) -- -P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
 $(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
 endef
 
@@ -74,10 +137,21 @@ findunusedcode:
 #to be just removed, or put behind appropiate platform or debug level ifdefs
 	@grep ::.*\( unusedcode.all | grep -v ^cppu:: > unusedcode.easy
 
+subsequentcheck: dev-install
+
+clean:
+	@true
+
+check: subsequentcheck
+	@true
+
+unitcheck: build
+	@true
 
 endif # gb_SourceEnvAndRecurse_STAGE=buildpl
     
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
+
 clean: clean-host clean-build
 
 dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | build
@@ -90,6 +164,5 @@ findunusedcode:
 
 endif
 
-all: build
 
 # vim: set noet sw=4:

solenv/gbuild/extensions/post_SpeedUpTargets.mk

@@ -35,10 +35,12 @@ endif
 endif
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
-ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install smoketestoo_native instsetoo_native cross_toolset findunusedcode debugrun,$(MAKECMDGOALS)),)
+ifneq ($(strip $(MAKECMDGOALS)),)
+ifeq ($(filter-out clean distclean id tags docs distro-pack-install fetch help debugrun $(SRCDIR)/Env.Host.sh,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
+endif
 
 ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),)
 gb_Module_add_target=

solenv/gbuild/gbuild.mk

@@ -248,35 +248,6 @@ $(eval $(call gb_Deliver_init))
 
 include $(SOLARENV)/inc/minor.mk
 
-ifeq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
-
-gb_ComponentTarget_ComponentTarget = $(call gb_ComponentTarget_get_target,$(1)): build
-gb_ComponentsTarget_ComponentsTarget = $(call gb_ComponentsTarget_get_target,$(1)): build
-gb_AllLangResTarget_AllLangResTarget = $(call gb_AllLangResTarget_get_target,$(1)): build
-gb_WinResTarget_WinResTarget = $(call gb_WinResTarget_get_target,$(1)): build
-gb_LinkTarget_LinkTarget = $(call gb_LinkTarget_get_target,$(1)): build
-gb_Library_Library = $(call gb_Library_get_target,$(1)): build
-gb_StaticLibrary_StaticLibrary = $(call gb_StaticLibrary_get_target,$(1)): build
-gb_Executable_Executable = $(call gb_Executable_get_target,$(1)): build
-gb_SdiTarget_SdiTarget = $(call gb_SdiTarget_get_target,$(1)): build
-gb_Package_Package = $(call gb_Package_get_target,$(1)): build
-gb_CustomTarget_CustomTarget = $(call gb_CustomTarget_get_target,$(1)): build
-gb_ExternalLib_ExternalLib = $(call gb_ExternalLib_get_target,$(1)): build
-gb_Pyuno_Pyuno = $(call gb_Pyuno_get_target,$(1)): build
-gb_RdbTarget_RdbTarget = $(call gb_RdbTarget_get_target,$(1)): build
-gb_CppunitTest_CppunitTest = $(call gb_CppunitTest_get_target,$(1)): build
-gb_Jar_Jar = $(call gb_Jar_get_target,$(1)): build
-gb_JavaClassSet_JavaClassSet = $(call gb_JavaClassSet_get_target,$(1)): build
-gb_JunitTest_JunitTest = $(call gb_JunitTest_get_target,$(1)): dev-install
-gb_UnoApiTarget_UnoApiTarget = $(call gb_UnoApiTarget_get_target,$(1)): build
-gb_Zip_Zip = $(call gb_Zip_get_target,$(1)): build
-gb_Configuration_Configuration = $(call gb_Configuration_get_target,$(1)): build
-gb_Extension_Extension = $(call gb_Extension_get_target,$(1)): build
-
-include $(GBUILDDIR)/Module.mk
-
-endif
-
 # We are using a set of scopes that we might as well call classes.
 
 # It is important to include them in the right order as that is

solenv/gbuild/source_and_rerun.mk

 
 gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-
 ifneq ($(strip $(gb_PARTIALBUILD)),)
 
 SRCDIR:=$(realpath $(gb_MAKEFILEDIR)/..)
 gb_SourceEnvAndRecurse_reconfigure=true
+gb_SourceEnvAndRecurse_buildpl=true
 
 else
 
 SRCDIR:=$(realpath $(gb_MAKEFILEDIR))
 gb_SourceEnvAndRecurse_reconfigure=$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(SRCDIR)/Env.Host.sh gb_SourceEnvAndRecurse_STAGE=reconfigure
+gb_SourceEnvAndRecurse_buildpl=$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(MAKECMDGOALS) gb_SourceEnvAndRecurse_STAGE=buildpl
 
 endif
 
@@ -19,9 +20,8 @@ source-env-and-recurse:
 	if test -f $(SRCDIR)/config.mk ; then . $(SRCDIR)/config.mk; fi && \
 	if test -f $(SRCDIR)/Env.Host.sh; then . $(SRCDIR)/Env.Host.sh; fi && \
 	if test -z "$${SOLARENV}"; then echo "no configuration found and could not create one" && exit 1; fi && \
-	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(MAKECMDGOALS) gb_SourceEnvAndRecurse_STAGE=buildpl && \
-	echo "---------GBUILD" && \
-	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(MAKECMDGOALS) gb_SourceEnvAndRecurse_STAGE=gbuild
+	$(gb_SourceEnvAndRecurse_buildpl) && \
+	$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j$${GMAKE_PARALLELISM} $(MAKECMDGOALS) gb_SourceEnvAndRecurse_STAGE=gbuild
 
 
 ifneq ($(strip $(MAKECMDGOALS)),)