Changeset 890 in kBuild

Timestamp:

May 2, 2007 11:27:22 PM (18 years ago)

Author:

bird

Message:

Applied a message patch.

Location:

trunk/kBuild

Files:

• header.kmk (modified) (1 diff)
• msgstyles/brief.kmk (modified) (5 diffs)

trunk/kBuild/header.kmk

@@ -813 +813 @@
  # @param 4     The source type (CXX,C,AS,RC,++).
  MSG_COMPILE  ?= $(call MSG_L1,Compiling $1 - $2,=> $3)
+ ## Tool
+ # @param 1     The tool name (bin2c,...)
+ # @param 2     Target name.
+ # @param 3     The source filename.
+ # @param 4     The primary output file name.
+ MSG_TOOL     ?= $(call MSG_L1,$1 $2 - $3,=> $4)
+ ## Generate a file, typically a source file.
+ # @param 1     Target name if applicable.
+ # @param 2     Output file name.
+ # @param 3     What it's generated from
+ MSG_GENERATE ?= $(call MSG_L1,Generating $(if $1,$1 - )$2,$(if $3,from $3))
  ## Linking a bldprog/dll/program/sysmod target.
  # @param 1     Target name.

trunk/kBuild/msgstyles/brief.kmk

@@ -27 +27 @@
 # Indent the messages, drop the kBuild: prefix, and shorten paths.
 ifndef KBUILD_VERBOSE
- MSG_L1 ?= @$(ECHO) "  $(subst $(PATH_ROOT)/,{R}/,$(subst $(PATH_OUT)/,{O}/,$(subst $(CURDIR)/,{C}/,$(subst $(PATH_TARGET)/,{T}/,$1))))"
+ MSG_L1 ?= @$(PRINTF) "  %-8s%s" "$(subst $(PATH_ROOT)/,{R}/,$(subst $(PATH_OUT)/,{O}/,$(subst $(CURDIR)/,{C}/,$(subst $(PATH_TARGET)/,{T}/,$1))))"
+ MSG_L1 ?= @$(PRINTF) "  %-8s%s\n" \
+        "$(subst $(PATH_ROOT)/,{R}/,$(subst $(PATH_OUT)/,{O}/,$(subst $(CURDIR)/,{C}/,$(subst $(PATH_TARGET)/,{T}/,$1))))" \
+        "$(subst $(PATH_ROOT)/,{R}/,$(subst $(PATH_OUT)/,{O}/,$(subst $(CURDIR)/,{C}/,$(subst $(PATH_TARGET)/,{T}/,$2))))"
 else
  MSG_L1 ?= @$(ECHO) "  $(subst $(PATH_ROOT)/,{R}/,$(subst $(PATH_OUT)/,{O}/,$(subst $(CURDIR)/,{C}/,$(subst $(PATH_TARGET)/,{T}/,$1 $2))))"
@@ -35 +38 @@
 ## Fetch starting.
 # @param 1     Target name.
-MSG_FETCH    ?= $(call MSG_L1,FTCH $1...)
+MSG_FETCH    ?= $(call MSG_L1,FTCH,$1...)
 ## Re-fetch starting.
 # @param 1     Target name.
-MSG_REFETCH  ?= $(call MSG_L1,RFTCH $1...)
+MSG_REFETCH  ?= $(call MSG_L1,RFTCH,$1...)
 ## Downloading a fetch component.
 # @param 1     Target name.
 # @param 2     The source URL.
 # @param 3     The destination file name.
-MSG_FETCH_DL ?= $(call MSG_L1,GET  $1 - $2,=> $3)
+MSG_FETCH_DL ?= $(call MSG_L1,GET,$1 - $2,=> $3)
 ## Checking a fetch component.
 # @param 1     Target name.
 # @param 2     The source URL.
 # @param 3     The destination file name.
-MSG_FETCH_CHK?= $(call MSG_L1,CHK  $1 - $3, ($2))
+MSG_FETCH_CHK?= $(call MSG_L1,CHK,$1 - $3, ($2))
 ## Unpacking a fetch component.
 # @param 1     Target name.
 # @param 2     The archive file name.
 # @param 3     The target directory.
-MSG_FETCH_UP ?= $(call MSG_L1,UNPK $1 - $2,=> $3)
+MSG_FETCH_UP ?= $(call MSG_L1,UNPK,$1 - $2,=> $3)
 ## Fetch completed.
 # @param 1     Target name.
-MSG_FETCH_OK ?= $(call MSG_L1,DONE $1)
+MSG_FETCH_OK ?= $(call MSG_L1,DONE,$1)
 ## Unfetch a fetch target.
 # @param 1     Target name.
-MSG_UNFETCH  ?= $(call MSG_L1,RM   $1...)
+MSG_UNFETCH  ?= $(call MSG_L1,RM,$1...)
 ## Compiling a source file.
 # @param 1     Target name.
@@ -65 +68 @@
 # @param 3     The primary link output file name.
 # @param 4     The source type (CXX,C,AS,RC,++).
-MSG_COMPILE  ?= $(call MSG_L1,CC   $1 - $2,=> $3)
+MSG_COMPILE  ?= $(call MSG_L1,$4,$1 - $2,=> $3)
+## Tool
+# @param 1     The tool name (bin2c,...)
+# @param 2     Target name.
+# @param 3     The source filename.
+# @param 4     The primary output file name.
+MSG_TOOL     ?= $(call MSG_L1,$1,$2 - $3,=> $4)
+## Generate a file, typically a source file.
+# @param 1     Target name if applicable.
+# @param 2     Output file name.
+# @param 3     What it's generated from
+MSG_GENERATE ?= $(call MSG_L1,GEN,$2)
 ## Linking a bldprog/dll/program/sysmod target.
 # @param 1     Target name.
 # @param 2     The primary link output file name.
 # @param 3     The link tool operation (LINK_LIBRARY,LINK_PROGRAM,LINK_DLL,LINK_SYSMOD,++).
-MSG_LINK     ?= $(call MSG_L1,$(if $(eq $3,LINK_LIBRARY),AR,LD)   $1,=> $2)
+MSG_LINK     ?= $(call MSG_L1,$(if $(eq $3,LINK_LIBRARY),AR,LD),$1,=> $2)
 ## Merging a library into the target (during library linking).
 # @param 1     Target name.
@@ -78 +92 @@
 ## Creating a directory (build).
 # @param 1     Directory name.
-MSG_MKDIR    ?= $(call MSG_L2,DIR  $1)
+MSG_MKDIR    ?= $(call MSG_L2,DIR,$1)
 ## Cleaning.
 MSG_CLEAN    ?= $(call MSG_L1,CLEAN)
@@ -87 +101 @@
 # @param 2     The source filename.
 # @param 3     The destination file name.
-MSG_INST_TRG ?= $(call MSG_L1,INST $1 => $3)
+MSG_INST_TRG ?= $(call MSG_L1,INST,$1 => $3)
 ## Installing a file (install target).
 # @param 1     The source filename.
 # @param 2     The destination filename.
-MSG_INST_FILE?= $(call MSG_L1,IFIL $2,(<= $1))
+MSG_INST_FILE?= $(call MSG_L1,IFIL,$2,(<= $1))
 ## Installing a symlink.
 # @param 1     Symlink
 # @param 2     Link target
-MSG_INST_SYM ?= $(call MSG_L1,ISYM $1,=> $2)
+MSG_INST_SYM ?= $(call MSG_L1,ISYM,$1,=> $2)
 ## Installing a directory.
 # @param 1     Directory name.
-MSG_INST_DIR ?= $(call MSG_L1,IDIR $1)
+MSG_INST_DIR ?= $(call MSG_L1,IDIR,$1)