diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-12 17:27:30 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-13 11:54:53 +0100 |
| commit | a1b8ccc16e433162df2243e531a35a45719dd1ac (patch) | |
| tree | 7d3ae585d5357ff44523e333f71949f617debf68 /solenv | |
| parent | 73093b588767ad3f2ea73e8be3246e33ae43b3c0 (diff) | |
gbuild: fix top-level "make check":
This should first build, then run smoketest, then run subsequenttests.
(cherry picked from commit 8bd011b527dbe77456c4822c57e0c6a1c1b93cfd)
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_BuildplTargets.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index cd98688f2d9b..b2e650df8cc0 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -36,7 +36,7 @@ ifeq ($(gb_SourceEnvAndRecurse_STAGE),buildpl) 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 @@ -61,7 +61,7 @@ $(call gb_Pyuno_get_target,%): build $(call gb_WinResTarget_get_target,%): build @true - + $(call gb_CppunitTest_get_target,%): build @true @@ -104,8 +104,14 @@ define gb_BuildplTarget_command 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) endef -dev-install: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS)) - $(call gb_BuildplTarget_command,smoketestoo_native,--from instsetoo_native) +# the build order dependencies are rather ugly... +dev-install: \ + $(WORKDIR)/bootstrap \ + $(SRCDIR)/src.downloaded \ + $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) \ + | $(filter build,$(MAKECMDGOALS)) \ + $(if $(filter check,$(MAKECMDGOALS)),build) + $(call gb_BuildplTarget_command,smoketestoo_native,) build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) $(call gb_BuildplTarget_command,instsetoo_native,--all) @@ -150,7 +156,7 @@ debugrun: @true endif # gb_SourceEnvAndRecurse_STAGE=buildpl - + ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild) clean: clean-host clean-build |