handle silent mode

Change-Id: I2ebcacc089d86c9de85b617d80d6a557498d8add

solenv/gbuild/InstallModuleTarget.mk

@@ -35,14 +35,21 @@ gb_ScpTemplateTarget_COMMAND := $(PERL) -w $(gb_ScpTemplateTarget_TARGET)
 
 gb_ScpTemplateTarget_LANGS := $(sort $(ALL_LANGS))
 
+# Pass first arg if make is running in silent mode, second arg otherwise
+define gb_ScpTemplateTarget__if_silent
+$(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2))
+endef
+
 gb_ScpTemplateTarget_get_source = $(SRCDIR)/$(1).sct
 
-# TODO: verbose mode
 define gb_ScpTemplateTarget__command
 $(call gb_Output_announce,$(2),$(true),SCT,1)
 $(call gb_Helper_abbreviate_dirs,\
 	export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
-	$(gb_ScpTemplateTarget_COMMAND) -verbose -i $(3) -o $(1) \
+	$(gb_ScpTemplateTarget_COMMAND) \
+		$(call gb_ScpTemplateTarget__if_silent,,-verbose) \
+		-i $(3) \
+		-o $(1) \
 )
 endef
 

solenv/gbuild/InstallScript.mk

@@ -27,12 +27,16 @@
 
 # InstallScriptTarget class
 
-# TODO: make par2script quiet, if necessary
 gb_InstallScriptTarget_TARGET := $(SOLARENV)/bin/par2script.pl
 gb_InstallScriptTarget_COMMAND := $(PERL) $(gb_InstallScriptTarget_TARGET)
 
 gb_InstallScriptTarget__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1)))
 
+# Pass first arg if make is running in silent mode, second arg otherwise
+define gb_InstallScriptTarget__if_silent
+$(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2))
+endef
+
 define gb_InstallScriptTarget__command
 $(call gb_Output_announce,$(2),$(true),INS,4)
 $(call gb_Helper_abbreviate_dirs,\
@@ -41,6 +45,7 @@ $(call gb_Helper_abbreviate_dirs,\
 			$(notdir $(foreach module,$(SCP_MODULE_DIRS),$(wildcard $(module)/*$(SCP_SUFFIX))))) \
 	) && \
 	$(gb_InstallScriptTarget_COMMAND) \
+		$(call gb_InstallScriptTarget__if_silent,-q) \
 		-i $(call gb_InstallScriptTarget__make_arglist,$(SCP_MODULE_DIRS) $(OUTDIR)/par) \
 	   	-o $(1) \
 	   	@@$${RESPONSEFILE} && \