gnumake2: beautified announcement

12 files changed, 47 insertions, 37 deletions

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index b284ff4aed21..93bb9000e6f6 100755
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -34,7 +34,7 @@ gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/l10n/$(INPATH)/misc/sdf/
 gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
 
 define gb_SrsPartMergeTarget__command
-$(call gb_Helper_announce,Processing $(3) ...)
+$(call gb_Helper_announce,$(3),$(true),srs)
 $(call gb_Helper_abbreviate_dirs_native,\
     mkdir -p $(dir $(1)) && \
     $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
@@ -119,7 +119,7 @@ gb_SrsTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
 
 .PHONY : $(call gb_SrsTarget_get_clean_target,%)
 $(call gb_SrsTarget_get_clean_target,%) :
-    $(call gb_Helper_announce,Cleaning up srs $* ...)
+    $(call gb_Helper_announce,$*,$(false),SRS)
     -$(call gb_Helper_abbreviate_dirs,\
         rm -f $(call gb_SrsTarget_get_target,$*) \
             $(call gb_SrsTarget_get_dep_target,$*) \
@@ -129,7 +129,7 @@ $(call gb_SrsTarget_get_clean_target,%) :
 
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_SrsTarget__command_dep
-$(call gb_Helper_announce,Collecting dependencies for srs $(2) ...)
+$(call gb_Helper_announce,SRS:$(2),$(true),DEP)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     cat $(3) > $(1))
@@ -138,7 +138,7 @@ endif
 
 $(call gb_SrsTarget_get_target,%) :
     $(call gb_SrsTarget__command_dep,$(call gb_SrsTarget_get_dep_target,$*),$*,$(foreach part,$(PARTS),$(call gb_SrsPartTarget_get_dep_target,$(part))))
-    $(call gb_Helper_announce,Processing srs $* ...)
+    $(call gb_Helper_announce,$*,$(true),SRS)
     $(call gb_Helper_abbreviate_dirs,\
         mkdir -p $(dir $@) && \
         cat $^ > $@)
@@ -199,12 +199,12 @@ gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
 gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/default_images/
 
 $(call gb_ResTarget_get_clean_target,%) :
-    $(call gb_Helper_announce,Cleaning up resource $* ...)
+    $(call gb_Helper_announce,$*,$(false),RES)
     $(call gb_Helper_abbreviate_dirs,\
         rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
 
 $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCTARGET)
-    $(call gb_Helper_announce,Building resource $@ ...)
+    $(call gb_Helper_announce,$*,$(true),RES)
     $(call gb_Helper_abbreviate_dirs_native,\
         mkdir -p $(dir $@) $(OUTDIR)/bin \
             $(dir $(call gb_ResTarget_get_imagelist_target,$(1))) && \
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index cb8a03a7256f..a5978c0515c6 100755
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -35,7 +35,7 @@ gb_ComponentTarget_get_source = $(1)/$(2).component
 # gb_ComponentTarget_PREFIXBASISNATIVE is set by the platform
 
 define gb_ComponentTarget__command
-$(call gb_Helper_announce,Processing $(2) ...)
+$(call gb_Helper_announce,$(3),$(true),CMP)
 $(call gb_Helper_abbreviate_dirs_native,\
     mkdir -p $(dir $(1)) && \
     $(gb_ComponentTarget_XSLTPROCCOMMAND) --nonet --stringparam uri \
@@ -46,10 +46,10 @@ endef
 
 define gb_ComponentTarget__rules
 $$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_ComponentTarget_XSLTPROCTARGET)
-    $$(call gb_ComponentTarget__command,$$@,$$<)
+    $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
 
 $$(call gb_ComponentTarget_get_clean_target,%) :
-    $$(call gb_Helper_announce,Cleaning component file $$*)
+    $$(call gb_Helper_announce,$$*,$(false),CMP)
     rm -f $$(call gb_ComponentTarget_get_outdir_target,$$*) $$(call gb_ComponentTarget_get_target,$$*)
 
 endef
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 2dadae3cb597..fee159eb5dd9 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -51,8 +51,16 @@ gb_Helper_CLEARONDELIVER := $(true)
 $(gb_Helper_MISCDUMMY) :
     @mkdir -p $(dir $@) && touch $@
 
+define gb_Helper__format_type
+[ $(2) $(word 2,$(1) >==> Oo._) ]
+endef
+
+define gb_Helper__format_target
+$(1)
+endef
+
 define gb_Helper_announce
-$(info $(1))
+$(info $(call gb_Helper__format_type,$(2),$(3)) $(call gb_Helper__format_target,$(1)))
 endef
 
 define gb_Helper_abbreviate_dirs
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 8c301ccc96f4..a6b58729b50d 100755
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -176,7 +176,7 @@ gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
 
 .PHONY : $(call gb_LinkTarget_get_clean_target,%)
 $(call gb_LinkTarget_get_clean_target,%) :
-    $(call gb_Helper_announce,Cleaning up link $* ...)
+    $(call gb_Helper_announce,$*,$(false),LNK)
     -$(call gb_Helper_abbreviate_dirs,\
         rm -f \
             $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
@@ -193,7 +193,7 @@ $(call gb_LinkTarget_get_clean_target,%) :
             $(AUXTARGETS))
 
 define gb_LinkTarget__command_dep
-$(call gb_Helper_announce,Collecting dependencies for link $(2) ...)
+$(call gb_Helper_announce,LNK:$(2),$(true),DEP)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     cat $(gb_Helper_NULLFILE)\
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index ca5d878b0af9..2606703448b6 100755
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -41,21 +41,23 @@ endif
 
 .PHONY : $(call gb_Module_get_clean_target,%)
 $(call gb_Module_get_clean_target,%) :
-    $(call gb_Helper_announce,Cleaning up module $* ...)
+    $(call gb_Helper_announce,$*,$(false),MOD)
     -$(call gb_Helper_abbreviate_dirs,\
         rm -f $(call gb_Module_get_target,$*))
 
 $(call gb_Module_get_target,%) :
-    $(call gb_Helper_announce,Completed module $* ...)
+    $(call gb_Helper_announce,$*,$(true),MOD)
     -$(call gb_Helper_abbreviate_dirs,\
         mkdir -p $(dir $@) && \
         touch $@)
 
 all : 
-    $(call gb_Helper_announce,Build for modules $(foreach module,$^,$(notdir $(module))) finished (loaded modules: $(sort $(gb_Module_ALLMODULES))).)
+    $(call gb_Helper_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(true),ALL)
+    $(call gb_Helper_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL)
 
 clean : 
-    $(call gb_Helper_announce,Cleanup for modules $(foreach module,$^,$(notdir $(module))) finished (loaded modules: $(sort $(gb_Module_ALLMODULES))).)
+    $(call gb_Helper_announce,top level modules: $(foreach module,$^,$(notdir $(module))),$(false),ALL)
+    $(call gb_Helper_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(false),ALL)
 
 .PHONY : all clean install uninstall
 .DEFAULT_GOAL := all
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 965683a1aa73..3bd2f465cdee 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -40,12 +40,12 @@ endef
 
 .PHONY : $(call gb_Package_get_clean_target,%)
 $(call gb_Package_get_clean_target,%) :
-    $(call gb_Helper_announce,Cleaning up package $* ...)
+    $(call gb_Helper_announce,$*,$(false),PKG)
     -$(call gb_Helper_abbreviate_dirs,\
         rm -f $(FILES))
 
 $(call gb_Package_get_target,%) :
-    $(call gb_Helper_announce,Copied all for package $* ...)
+    $(call gb_Helper_announce,$*,$(true),PKG)
     mkdir -p $(dir $@) && touch $@
 
 define gb_Package_Package
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
index 30429df89546..2361e059ff29 100755
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -57,14 +57,14 @@ $(call gb_NoexPrecompiledHeader_get_target,%) :
 
 .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%)
 $(call gb_PrecompiledHeader_get_clean_target,%) :
-    $(call gb_Helper_announce,Cleaning up pch $* ...)
+    $(call gb_Helper_announce,$*,$(true),PCH)
     -$(call gb_Helper_abbreviate_dirs,\
         rm -f $(call gb_PrecompiledHeader_get_target,$*) \
             $(call gb_PrecompiledHeader_get_dep_target,$*))
 
 
 $(call gb_NoexPrecompiledHeader_get_clean_target,%) :
-    $(call gb_Helper_announce,Cleaning up noex pch $* ...)
+    $(call gb_Helper_announce,$*,$(true),PCH)
     -$(call gb_Helper_abbreviate_dirs,\
         rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \
             $(call gb_NoexPrecompiledHeader_get_dep_target,$*))
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index b347359dd94e..83e5f93bd9c1 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -33,7 +33,7 @@ gb_SdiTarget_SVIDLAUXDEPS := $(call gb_Library_get_target,tl) $(call gb_Library_
 gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
 
 $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET) $(gb_SdiTarget_SVIDLAUXDEPS)
-    $(call gb_Helper_announce,Processing sdi $* ...)
+    $(call gb_Helper_announce,$*,$(true),SDI)
     $(call gb_Helper_abbreviate_dirs,\
         mkdir -p $(dir $(WORKDIR)/inc/$*) $(dir $@))
     $(call gb_Helper_abbreviate_dirs_native,\
@@ -50,7 +50,7 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET
 
 .PHONY : $(call gb_SdiTarget_get_clean_target,%)
 $(call gb_SdiTarget_get_clean_target,%) :
-    $(call gb_Helper_announce,Cleaning up sdi $* ...)
+    $(call gb_Helper_announce,$*,$(false),SDI)
     -$(call gb_Helper_abbreviate_dirs,\
         rm -f $(foreach ext,.hxx .ilb .lst .sid,\
             $(call gb_SdiTarget_get_target,$*)$(ext)) \
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 536be2d93162..dca186059250 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -140,7 +140,7 @@ gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 # CObject class
 
 define gb_CObject__command
-$(call gb_Helper_announce,Compiling $(2) (plain C) ...)
+$(call gb_Helper_announce,$(2),$(true),C  )
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
@@ -158,7 +158,7 @@ endef
 # CxxObject class
 
 define gb_CxxObject__command
-$(call gb_Helper_announce,Compiling $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),CXX)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
@@ -220,7 +220,7 @@ gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 define gb_LinkTarget__command
-$(call gb_Helper_announce,Linking $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),LNK)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     $(gb_CXX) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 67c6d12725e0..22f2a21ee283 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -138,7 +138,7 @@ gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 # CObject class
 
 define gb_CObject__command
-$(call gb_Helper_announce,Compiling $(2) (plain C) ...)
+$(call gb_Helper_announce,$(2),$(true),C  )
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \
@@ -157,7 +157,7 @@ endef
 
 # N.B: $(4) or $(5) may contain -x objective-c++, which must come before -c
 define gb_CxxObject__command
-$(call gb_Helper_announce,Compiling $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),CXX)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
@@ -175,7 +175,7 @@ endef
 # ObjCxxObject class
 
 define gb_ObjCxxObject__command
-$(call gb_Helper_announce,Compiling $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),OCX)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     mkdir -p $(dir $(call gb_ObjCxxObject_get_dep_target,$(2))) && \
@@ -243,7 +243,7 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 # solver layout is different from installation layout
 # FIXME framework handling very hackish
 define gb_LinkTarget__command
-$(call gb_Helper_announce,Linking $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),LNK)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     DYLIB_FILE=`$(gb_MKTEMP) $(dir $(1))` && \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index e05e05f7d743..d8e728c7fb58 100755
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -120,7 +120,7 @@ gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 # CObject class
 
 define gb_CObject__command
-$(call gb_Helper_announce,Compiling $(2) (plain C) ...)
+$(call gb_Helper_announce,$(2),$(true),C  )
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     rm -f $(call gb_CObject_get_dep_target,$(2)) && \
@@ -139,7 +139,7 @@ endef
 # CxxObject class
 
 define gb_CxxObject__command
-$(call gb_Helper_announce,Compiling $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),CXX)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \
@@ -199,7 +199,7 @@ gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
 gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 define gb_LinkTarget__command
-$(call gb_Helper_announce,Linking $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),LNK)
 $(call gb_Helper_abbreviate_dirs,\
     mkdir -p $(dir $(1)) && \
     $(gb_CXX) \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 360ab03a14b8..44b33374c275 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -217,7 +217,7 @@ endif
 # E is the linker output, that we are only interested in on error (good programs keep silent on success)
 # RC is the return code of the link command
 define gb_CObject__command
-$(call gb_Helper_announce,Compiling $(2) (plain C) ...)
+$(call gb_Helper_announce,$(2),$(true),C  )
 $(call gb_Helper_abbreviate_dirs_native,\
     mkdir -p $(dir $(1)) && \
     RC=0 && C="$(gb_CC) \
@@ -260,7 +260,7 @@ endif
 # E is the linker output, that we are only interested in on error (good programs keep silent on success)
 # RC is the return code of the link command
 define gb_CxxObject__command
-$(call gb_Helper_announce,Compiling $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),CXX)
 $(call gb_Helper_abbreviate_dirs_native,\
     mkdir -p $(dir $(1)) && \
     RC=0 && C="$(gb_CXX) \
@@ -301,7 +301,7 @@ gb_PrecompiledHeader__command_deponcompile =
 endif
 
 define gb_PrecompiledHeader__command
-$(call gb_Helper_announce,Compiling pch $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),PCH)
 $(call gb_Helper_abbreviate_dirs_native,\
     mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
     RC=0 && C="$(gb_CXX) \
@@ -342,7 +342,7 @@ gb_NoexPrecompiledHeader__command_deponcompile =
 endif
 
 define gb_NoexPrecompiledHeader__command
-$(call gb_Helper_announce,Compiling noex pch $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),PCH)
 $(call gb_Helper_abbreviate_dirs_native,\
     mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
     RC=0 && C="$(gb_CXX) \
@@ -382,7 +382,7 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 # E is the linker output, that we are only interested in on error (good programs keep silent on success)
 # R is the return code of the link command
 define gb_LinkTarget__command
-$(call gb_Helper_announce,Linking $(2) ...)
+$(call gb_Helper_announce,$(2),$(true),LNK)
 $(call gb_Helper_abbreviate_dirs_native,\
     mkdir -p $(dir $(1)) && \
     RESPONSEFILE=$$(mktemp --tmpdir=$(gb_Helper_MISC)) && \