strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only depend from dev-install on build if it is an explicit goal

Browse source
This commit is contained in:
Bjoern Michaelsen 2011-12-06 17:15:44 +01:00
parent 2ca9a7e82c
commit ab225eead3
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
solenv/gbuild/JunitTest.mk
View file

@ -58,7 +58,7 @@ $(call gb_JunitTest_get_target,%) :
&& echo "see full error log at $@.log" \
&& echo "to rerun just this failed test without all others, run:" \
&& echo && echo " make $@" && echo \
&& echo "cd into the module dir if you do not want a full dev-install run" \
&& echo "cd into the module dir to run the tests faster" \
&& echo "Or to do interactive debugging, run two shells with (Linux only):" \
&& echo \
&& echo " make debugrun" \

8
solenv/gbuild/extensions/post_BuildplTargets.mk
View file

@ -100,14 +100,12 @@ gb_MAKETARGET=build
endif
endif
gb_BuildplTarget_COMPLETEDTARGETS=
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)
$(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
endef
dev-install: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | build
$(call gb_BuildplTarget_command,smoketestoo_native,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from instsetoo_native,--all))
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)
build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,instsetoo_native,--all)
@ -154,7 +152,7 @@ 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
dev-install: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)