From 0db89bcabfb4e207bed95b4a14685391311eaa3e Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 28 Mar 2015 23:24:05 -0500 Subject: make gbuild a bit more quiet by default On a regular build, gbuild print over and over the 'loaded modules' which is a long landry list that serve little purpsose but to make it hard to read the output If you _really_ want to still see that use verbose=t Change-Id: I0950f471b68e84c0cbd2c0afd2721394f70da398 --- solenv/gbuild/Module.mk | 16 ++++++++-------- solenv/gbuild/gbuild.mk | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 253564ce5957..117d038bbaa5 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -123,46 +123,46 @@ build-tools : $(gb_BUILD_TOOLS) build : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6) - $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6) + $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)) $(call gb_Output_announce_title,build done.) $(call gb_Output_announce_bell) build-l10n-only : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),LOC,6) - $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),LOC,6) + $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),LOC,6)) $(call gb_Output_announce_title,l10n done.) $(call gb_Output_announce_bell) build-non-l10n-only : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),BIN,6) - $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),BIN,6) + $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),BIN,6)) $(call gb_Output_announce_title,non-l10n done.) $(call gb_Output_announce_bell) unitcheck : - $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6) + $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6)) $(call gb_Output_announce_title,all unittests checked.) $(call gb_Output_announce_bell) slowcheck : - $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SLC,6) + $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SLC,6)) $(call gb_Output_announce_title,all slowtests checked.) $(call gb_Output_announce_bell) # removing the dependency on build for now until we can make a full build with gbuild #subsequentcheck : all subsequentcheck : - $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6) + $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCK,6)) $(call gb_Output_announce_title,all subsequent tests checked.) $(call gb_Output_announce_bell) perfcheck : - $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),PFC,6) + $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),PFC,6)) $(call gb_Output_announce_title,all perftests checked.) $(call gb_Output_announce_bell) clean : - $(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6) + $(if $(gb_VERBOSE),$(call gb_Output_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL,6)) $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL,6) $(call gb_Output_announce_title,all cleared.) $(call gb_Output_announce_bell) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 48439f3762ba..756b845dd209 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -78,6 +78,8 @@ COMMA :=, CLOSE_PAREN :=) +gb_VERBOSE := $(verbose)$(VERBOSE) + include $(GBUILDDIR)/Helper.mk # optional extensions that should never be essential -- cgit v1.2.3